Commit Graph

97 Commits

Author SHA1 Message Date
Kyle Robinson Young
42115bdfac Update copyright to 2016 2016-01-04 17:14:52 -08:00
XhmikosR
f32a7bc3ad Minor lint tweaks. 2015-10-23 03:04:31 +03:00
Rusty Nelson
ba807dde2d Removed whitespace 2015-09-24 12:35:49 -04:00
Rusty Nelson
dfcc8125d2 Update jasmine.js
Removed install dependent path resolution.  The assumption of the package structure limits the usage of this module to only vanilla node.js when it doesn't have to.  By using dynamic resolution other structures may be utilized as well as allowing for the default structure to change without breaking implementation.
2015-09-21 08:12:27 -04:00
Michael Hogg
b1d1305204 tasks/jasmine.js: fix JSHint issue 2015-08-04 15:12:43 +01:00
Michael Hogg
b395ce8eea tasks/jasmine.js: fix bug in logSummary()
This bug was introduced in commit f5ac86e ("Assorted lint fixes")
2015-08-04 14:49:31 +01:00
XhmikosR
f5ac86edf2 Assorted lint fixes. 2015-04-24 01:41:14 +03:00
XhmikosR
220c0e18ca Update JSHint config. 2015-02-27 10:11:19 +02:00
robmadole
7bb22be249 Fixes #145 by adding the summary to thisRun 2015-01-08 11:37:01 -06:00
Kyle Robinson Young
b6f1be0585 Update copyright to 2015 2015-01-01 11:30:19 -08:00
Luke Page
e4bb889ea4 remove listeners when using the build flag
, fixes #176
2014-10-20 09:14:21 +01:00
S McCollum
56b7ff4d69 Added handler for fail.load 2014-10-06 19:36:13 -07:00
slackersoft
f5a02ca9a0 Depend on jasmine-core npm instead of vendoring
- jasmine-core now exports the files necessary to load jasmine in an
  html page.

- This allows users to choose their jasmine version by just updating
  their jasmine-core dependency.
2014-08-22 22:51:30 -07:00
cobbdb
ad0310bfd9 Expose polyfills option to inject additional libraries above core jasmine
scripts.
2014-08-03 19:41:26 -07:00
Jarrod Overson
bf27b3e831 moved jshint task to test and fixed lint errors 2014-07-26 19:22:30 -07:00
Jarrod Overson
e1f8004c6e Merge branch 'add_stack_in_summary' of https://github.com/kissrobber/grunt-contrib-jasmine into kissrobber-add_stack_in_summary
* 'add_stack_in_summary' of https://github.com/kissrobber/grunt-contrib-jasmine:
  add a stack in summary
2014-07-26 19:10:31 -07:00
Scott Davis
acca918ce5 Fixes circular reference bug phantom reporter caused by jasmine 2.0.1 2014-07-25 07:37:56 -06:00
Scott Davis
a5a3763e3f Jasmine 2.0.1 support 2014-07-23 15:32:40 -06:00
kissrobber
e1efe79c69 add a stack in summary 2014-07-20 21:30:06 +09:00
Vlad Filippov
5d036af878 Merge pull request #134 from Wildhoney/add_cdata_to_junit
Wrapped Failure Message in CDATA
2014-07-07 14:42:21 -07:00
Paul Meyerle
0a34006863 Squashed commit of the following:
commit 45fc50c09e60aafc0134248a9fd9c55db0b413d2
Author: Paul Meyerle <pmeyerle@smartertravelmedia.com>
Date:   Thu Mar 13 14:30:30 2014 -0400

    suiteDone should reference the suite id

Closes gh-129.
2014-07-01 09:19:48 -07:00
Vlad Filippov
c040bc834c Merge pull request #139 from timhall/file-expand
Update file expand behavior
2014-06-07 15:08:47 -07:00
Vlad Filippov
a2f523d0de Merge pull request #133 from dubspeed/none_output
added 'none' as valid display option
2014-06-07 15:03:53 -07:00
Michael Lennartz
bbe22a5c74 Squashed commit of the following:
commit a360e3e57fd95f6ea5fe117cca1b31ef83bbc302
Author: vladikoff <vlad.filippov@gmail.com>
Date:   Sat Jun 7 11:13:44 2014 -0700

    Fix spaces

commit 6dae9be0d83eede54e3c3bda454d716f2599d9ba
Author: Michael Lennartz <michael.lennartz@innogames.com>
Date:   Fri Mar 21 19:06:03 2014 +0100

    fix misplaced closing bracket

commit 62ccbe97707e2f47588a6c7fbaefc6877d68678b
Author: Michael Lennartz <michael.lennartz@innogames.com>
Date:   Fri Mar 21 15:49:05 2014 +0100

    add try/catch for stringify

Closes gh-132.
2014-06-07 11:13:50 -07:00
Chris O.
238aad2e06 Option to allow specifying a junitTemplate
Allow for a customized junitTemplate using options.junit.template.
2014-05-19 22:43:40 -07:00
Vlad Filippov
f28ced0bea Merge pull request #138 from stdavis/favicon
Added jasmine favicon to default html runner template.
2014-05-18 14:47:06 -04:00
vladikoff
1b262fc9ae Update indentLevel. Fixes #135. Fixes #140. 2014-04-27 14:45:56 -04:00
Tim Hall
86aaa6d453 Update file expand in getRelativeFileList
`getRelativeFileList` was stepping through patterns rather than passing
them all to `grunt.file.expand` leading to exclusions (`!`) being missed
since they remove rather than add files to the list.
2014-04-22 17:43:59 -04:00
Scott Davis
2e735b34e0 Added jasmine favicon to default html runner template.
This will allow this project to be used with the [jasmine-favicon-reporter](https://github.com/simsalabim/jasmine-favicon-reporter) project as well as make the spec runner look a bit nicer.
2014-04-11 14:55:18 -06:00
Adam Timberlake
45a96782ad Wrapped Failure Message in CDATA 2014-03-27 12:47:45 +00:00
Jmeas Smith
420a84464e Merge pull request #118 from wheresrhys/patch-1
Moved scripts inside the body tag
2014-03-26 22:07:15 -04:00
Michael Lennartz
12a07d2ff4 added 'none' as valid display option 2014-03-21 16:15:08 +01:00
Jarrod Overson
5f717e0387 fixed symbol reference 2014-03-19 16:20:42 -07:00
Jarrod Overson
f610a2b388 Merge branch 'master' of https://github.com/magalhas/grunt-contrib-jasmine into magalhas-master
* 'master' of https://github.com/magalhas/grunt-contrib-jasmine:
  including es5-shim instead of standalone bind polyfill
2014-02-27 14:25:44 -08:00
Christian Rondeau
1d43bf20e7 merged summary 2014-02-27 14:16:27 -08:00
Jarrod Overson
1123e03044 separated long vs short symbols 2014-02-27 14:02:10 -08:00
Christian Rondeau
6e77b4eda2 short display of test run results using options.short 2014-02-26 15:21:55 -05:00
magalhas
476c1b6b1c including es5-shim instead of standalone bind polyfill 2014-02-25 19:42:30 +00:00
Rhys Evans
20aebec1fd Moved scripts inside the body tag
Putting scripts as the last item before the closing body tag is these days probably the most common approach to loading scripts in a page, so the jasmine template should arguably follow this convention.

Also this means setup scripts within my src that assume body is present and which run before any specs do will not throw an error
2014-02-13 10:29:35 +00:00
Jarrod Overson
5ecc8fd961 accounted for non-terminal output, closes #110 2014-01-30 12:26:29 -08:00
Jarrod Overson
f4d50bad42 removed more unnecessary code in reporter 2014-01-29 08:33:47 -08:00
Jarrod Overson
8c111a15ae added watch dep, removed console logging for performance in browser 2014-01-28 17:15:55 -08:00
Jarrod Overson
dfa9182e20 updated logging and junit output for jasmine 2.0.0 2014-01-28 17:12:51 -08:00
Jarrod Overson
27512c9dc6 making client logs more visible 2013-11-20 16:50:53 -08:00
Jarrod Overson
17190d25c1 updating tests for 2.0 2013-11-20 16:46:27 -08:00
Sheel Choksi and Tim Jarratt
cbb57ff310 Update phantom reporter to use Jasmine 2.x reporter interface
Includes support for pending specs
2013-10-30 09:46:44 -07:00
Travis Jeffery
a78d1cd558 Add jasmine v2.0.0-rc3 2013-10-25 00:19:28 -05:00
jakerella
9af3f8abd9 Removed unused 'phantomjs' options object from task per issue #82 in main repo. 2013-09-10 11:09:33 -05:00
Jarrod Overson
dda77661fd Merge branch 'filter' of https://github.com/stilva/grunt-contrib-jasmine into stilva-filter
* 'filter' of https://github.com/stilva/grunt-contrib-jasmine:
  Added a filter flag, to filter through the *Spec files
2013-09-02 11:00:08 -07:00
Jarrod Overson
63ccee9ef9 Merge pull request #77 from existentialism/junit-failure-output
Fixed missing junit failure output (#76)
2013-09-02 10:23:03 -07:00