Commit Graph

212 Commits

Author SHA1 Message Date
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
166057a0a3 built readme 2014-03-19 16:21:24 -07:00
Jarrod Overson
5eaa39950d 0.6.3 2014-03-19 16:21:00 -07:00
Jarrod Overson
5f717e0387 fixed symbol reference 2014-03-19 16:20:42 -07:00
Jarrod Overson
4d08197dc2 Merge pull request #127 from shaqq/master
Adding a complex example
2014-03-07 15:51:42 -08:00
Shaker Islam
a615cc9052 Adding a complex example 2014-03-07 15:25:39 -06:00
Vlad Filippov
c93eee129b Update jasmine-options.md 2014-03-04 13:04:19 -05:00
Vlad Filippov
8b44250fb4 Merge pull request #126 from scottsword/patch-1
Update README.md
2014-03-04 13:03:53 -05:00
Scott Sword
1c4f9282d4 Update README.md
Added additional info for the source. When using a requireJS template the source is pulled through requireJS. I found it confusing when people had tried to load a controller in both the src and from their module. This provides better clarification for RequireJS users.
2014-03-03 17:27:48 -07:00
Kyle Robinson Young
13f5a998fb Update copyright to 2014 2014-02-28 16:54:50 -08: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
Jarrod Overson
f282a065e2 generated readme 2014-02-27 14:16:44 -08:00
Jarrod Overson
1e0b7a7104 0.6.2 2014-02-27 14:16: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
839a2a9994 updated autogenned doc 2014-01-30 12:27:04 -08:00
Jarrod Overson
f02bf7fc1f 0.6.1 2014-01-30 12:26:33 -08:00
Jarrod Overson
5ecc8fd961 accounted for non-terminal output, closes #110 2014-01-30 12:26:29 -08:00
Jarrod Overson
30ad17e4bc removed version in readme header 2014-01-29 09:44:48 -08:00
Jarrod Overson
c755025c57 merged jasmine 2.0.0 branch 2014-01-29 08:53:31 -08:00
Jarrod Overson
4f50a8e4d2 0.6.0 2014-01-29 08:52:05 -08:00
Jarrod Overson
d89f0a9d2f updated docs 2014-01-29 08:51:59 -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
12854458f2 updated jasmine to 2.0.0 final 2014-01-28 17:12:07 -08:00
Vlad Filippov
c7b89e3883 Merge pull request #106 from cgross/master
Enhanced output. Fixes #87 and fixes #104.
2014-01-27 11:21:25 -08:00
Chris Gross
b74dcac449 Enhanced output. Fixes #87 and fixes #104. 2014-01-27 12:51:53 -05:00
Sindre Sorhus
82d37dffe9 Merge pull request #104 from radkodinev/colorized-output-with-chalk
Use chalk module to colorize terminal output
2014-01-27 09:13:55 -08:00
Radko Dinev
e94e191d17 Use chalk module to colorize terminal output 2014-01-07 15:01:47 +02:00
Jarrod Overson
7d30a38661 Merge pull request #99 from dubspeed/master
PhantomReporter: Testing for Node instance fails when Node is a SocketIO...
2013-12-17 08:21:30 -08:00
Michael
c74744e9ce PhantomReporter: Testing for Node instance fails when Node is a SocketIO Object
In recent V8 builds Nodeis defined as a SocketIO object, instanceof on it in line 123 causes a TypeError exception.
2013-12-17 12:05:53 +01:00
Kyle Robinson Young
965da97732 Explicitly set files to publish to npm. Ref gruntjs/gruntjs.com#65 2013-12-15 10:16:49 -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
August Toman-Yih and Sheel Choksi
2762631aea Bump to Jasmine 2.0.0-rc5 2013-10-30 11:00:50 -07: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
Kyle Robinson Young
51a8db2b23 Remove Gruntfile.js as main in package.json 2013-09-14 12:43:16 -07:00
Jarrod Overson
ab8b22d13d Merge pull request #83 from jakerella/master
Removed unused 'phantomjs' options object from task
2013-09-10 09:51:22 -07: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
dfe8f05d42 0.5.2 2013-09-02 11:05:38 -07:00