Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[WIP][BETA] Jasmine 2.0 Support #294

Open
wants to merge 82 commits into from

4 participants

@tebriel

hacking in 2.0 support, pulling out things that are confusing, such as RequireJS support which I'm still not fully convinced ever worked.

you can now install this for testing through npm via:

npm install -g jasmine-node@2.0.0-beta4
Chris Moultrie and others added some commits
Chris Moultrie Reporter is broken, but loading in the environment e4d4fba
Chris Moultrie readme update 4b1e503
Chris Moultrie more hacking ce0bc06
Chris Moultrie More workey, but not much 7ee2e26
Chris Moultrie Starting on a reporter re-write 33021f3
Chris Moultrie More betterer 2783a1c
Chris Moultrie More comments 2091bfd
Chris Moultrie Whoops, shouldn't have committed that line 7225dc9
Chris Moultrie Helpers are different now d4289b3
Chris Moultrie Got rid of helper option, because jasmine doesn't like that ddb5210
Chris Moultrie Whoops. Helpers /can/ still be useful 45be837
Chris Moultrie Removing stuff we don't care about anymore b40408c
Chris Moultrie Mass removal of files d3db39c
Chris Moultrie Annnd More Changes 60e8bb9
Chris Moultrie Verbose reporter is now a thing 76ade54
Chris Moultrie Removing cruft 361d772
Chris Moultrie More cleanup e6728c5
Chris Moultrie Removing things that are incompatible with 2.0 323a926
Chris Moultrie More reomval 6d3c685
Chris Moultrie Removing requirements and upgrading packages b2be5c8
Chris Moultrie Removing the async-callback stuff, rely on Jasmine's impl b3ff038
Chris Moultrie Modern Workflows for Modern Coders 2ec9b38
Chris Moultrie Stack filter is back bf3578e
Chris Moultrie Such change. So Wow. 8106547
Chris Moultrie Readme update a4190c2
Chris Moultrie Auto testing, checking args 6a06824
Chris Moultrie Updated to allow growl back in when ready 87b743c
Chris Moultrie Checking for TTY, disabling color if not
Resolves #253
45c85b4
@AlphaHydrae AlphaHydrae Restored growl reporter. 23e1594
Chris Moultrie Fixed a bug with --matchAll not taking effect 415611c
Chris Moultrie Fixed matching 1532e97
Chris Moultrie Wow, lots of cleanup c2b339c
Chris Moultrie Merge branch 'growl-reporter-upgrade' of git://github.com/AlphaHydrae…
…/jasmine-node into Jasmine2.0

Conflicts:
	lib/jasmine-node/cli.js
	lib/jasmine-node/jasmine-loader.js
	src/cli.coffee
	src/jasmine-loader.coffee
abf56ba
Chris Moultrie Rewrote autotest in coffeescript, fixed the result bug bee54fa
Chris Moultrie Removing unused file 33cd763
Chris Moultrie Converted Boot.js to a node style a0272fb
Chris Moultrie No longer desiring specs to fail 6ef3ae3
Chris Moultrie Whoa, now that's a refactor! Making available to `require` 9a666e4
Chris Moultrie Now importable as `require('jasmine-node')` 36d2864
Chris Moultrie Now alerting when no specs were found instead of exiting with 0,0,0 36326be
Chris Moultrie Minor cleanup e7dbe32
Chris Moultrie Merge branch 'master' of github.com:mhevery/jasmine-node into Jasmine2.0
Conflicts:
	README.md
	lib/jasmine-node/cli.js
	lib/jasmine-node/jasmine-1.3.1.js
	package.json
2f1f1cf
Chris Moultrie Merge branch 'master' into Jasmine2.0
Conflicts:
	package.json
db4b502
Chris Moultrie Setting beta version for npm 1476299
Chris Moultrie Reporter spec is now in coffee, added logo cadcf9e
Chris Moultrie Less muddying of the global state 3e72458
Chris Moultrie More global scope de-muddification c71fe8e
Chris Moultrie Fixing issues with the type checker in jasmine.any 2efccab
Chris Moultrie Fixed the jasmine issue by modifying the vm's context 33becca
Chris Moultrie Un-broke the setInterval/setTimeout e8bc8fb
Chris Moultrie Added a noop to onComplete Defaults 556511d
Chris Moultrie Updating the docs and such bdd3aac
Chris Moultrie Removed old commented line 2e55688
Chris Moultrie Removing unused arg 1b59d91
Chris Moultrie Adding travis support 59f2096
Chris Moultrie Auto build stuff, please work 7582fd4
Chris Moultrie Merge branch 'master' into Jasmine2.0
Conflicts:
	.travis.yml
6a100f8
Chris Moultrie Adding dep status image c392771
Chris Moultrie ugh e85a397
Chris Moultrie More changes 6815b4b
Chris Moultrie minor changes, starting work on junit reporter f3c835e
Chris Moultrie More newlines 2acb826
Chris Moultrie Debug flag, file-finder cleanup/trimming a3889aa
Chris Moultrie Stop mangling the filename e15f733
Chris Moultrie Refactor to make the file finder a bit simpler and more readable a77ea35
Chris Moultrie Modifications to make done misconfiguration better..er 96129ca
Chris Moultrie Minor reporter changes 6d92874
Chris Moultrie More reporter cleanup 7708324
Chris Moultrie Updated unit test 5fc27c9
Chris Moultrie Grunt test and cleanup 0d0bc16
Chris Moultrie Temporary workaround for done/return issue 7b16ea6
Chris Moultrie Cleanup, refactor, more testing 4a96624
Chris Moultrie trying to get CI to work 89d525f
Chris Moultrie Merge branch 'master' of github.com:mhevery/jasmine-node into Jasmine2.0
Conflicts:
	README.md
	lib/jasmine-node/cli.js
	lib/jasmine-node/index.js
	lib/jasmine-node/reporter.js
	package.json
7700c0a
Chris Moultrie Adding Jasmine-Reporters commit-ish 32879b4
Chris Moultrie Junit Starting 0622c27
Chris Moultrie JUnit Config works 45c0074
Chris Moultrie Ignoring reports folder 180318a
Chris Moultrie Upgraded jasmine-reporters and fixed color/TTY issue with autoRun
Resolves #306
f936601
Chris Moultrie Comments! 6a5f729
Chris Moultrie Now supporting nunit as well fa6a161
Chris Moultrie NPM Publishing 2.0.0-beta4 8045968
@blacksonic

RequireJs support worked for 1.3, please don't remove it, i actively use it in my project: https://github.com/blacksonic/minesweeper

@mik01aj

I think that you should put a big fat warning that the timer mocking might not work as expected because it mocks only {set,clear}{Interval,Timeout} functions, and Node has also other scheduling mechanism, process.nextTick.

Btw, there is also setImmediate, which can work AFAIK both in node and browsers... Maybe it's worth filing an issue for Jasmine itelf. :confused:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 3, 2014
  1. Reporter is broken, but loading in the environment

    Chris Moultrie authored
  2. readme update

    Chris Moultrie authored
Commits on Mar 4, 2014
  1. more hacking

    Chris Moultrie authored
  2. More workey, but not much

    Chris Moultrie authored
  3. Starting on a reporter re-write

    Chris Moultrie authored
Commits on Mar 5, 2014
  1. More betterer

    Chris Moultrie authored
  2. More comments

    Chris Moultrie authored
  3. Whoops, shouldn't have committed that line

    Chris Moultrie authored
  4. Helpers are different now

    Chris Moultrie authored
  5. Whoops. Helpers /can/ still be useful

    Chris Moultrie authored
  6. Removing stuff we don't care about anymore

    Chris Moultrie authored
  7. Mass removal of files

    Chris Moultrie authored
  8. Annnd More Changes

    Chris Moultrie authored
  9. Verbose reporter is now a thing

    Chris Moultrie authored
  10. Removing cruft

    Chris Moultrie authored
  11. More cleanup

    Chris Moultrie authored
Commits on Mar 6, 2014
  1. Removing things that are incompatible with 2.0

    Chris Moultrie authored
  2. More reomval

    Chris Moultrie authored
  3. Removing requirements and upgrading packages

    Chris Moultrie authored
  4. Removing the async-callback stuff, rely on Jasmine's impl

    Chris Moultrie authored
  5. Modern Workflows for Modern Coders

    Chris Moultrie authored
  6. Stack filter is back

    Chris Moultrie authored
  7. Such change. So Wow.

    Chris Moultrie authored
  8. Readme update

    Chris Moultrie authored
  9. Auto testing, checking args

    Chris Moultrie authored
  10. Updated to allow growl back in when ready

    Chris Moultrie authored
  11. Checking for TTY, disabling color if not

    Chris Moultrie authored
    Resolves #253
Commits on Mar 7, 2014
  1. @AlphaHydrae

    Restored growl reporter.

    AlphaHydrae authored
  2. Fixed a bug with --matchAll not taking effect

    Chris Moultrie authored
  3. Fixed matching

    Chris Moultrie authored
  4. Wow, lots of cleanup

    Chris Moultrie authored
  5. Merge branch 'growl-reporter-upgrade' of git://github.com/AlphaHydrae…

    Chris Moultrie authored
    …/jasmine-node into Jasmine2.0
    
    Conflicts:
    	lib/jasmine-node/cli.js
    	lib/jasmine-node/jasmine-loader.js
    	src/cli.coffee
    	src/jasmine-loader.coffee
  6. Rewrote autotest in coffeescript, fixed the result bug

    Chris Moultrie authored
  7. Removing unused file

    Chris Moultrie authored
  8. Converted Boot.js to a node style

    Chris Moultrie authored
  9. No longer desiring specs to fail

    Chris Moultrie authored
  10. Now importable as `require('jasmine-node')`

    Chris Moultrie authored
  11. Minor cleanup

    Chris Moultrie authored
  12. Merge branch 'master' of github.com:mhevery/jasmine-node into Jasmine2.0

    Chris Moultrie authored
    Conflicts:
    	README.md
    	lib/jasmine-node/cli.js
    	lib/jasmine-node/jasmine-1.3.1.js
    	package.json
  13. Merge branch 'master' into Jasmine2.0

    Chris Moultrie authored
    Conflicts:
    	package.json
  14. Setting beta version for npm

    Chris Moultrie authored
Commits on Mar 8, 2014
  1. Reporter spec is now in coffee, added logo

    Chris Moultrie authored
Commits on Mar 9, 2014
  1. Less muddying of the global state

    Chris Moultrie authored
  2. More global scope de-muddification

    Chris Moultrie authored
  3. Fixing issues with the type checker in jasmine.any

    Chris Moultrie authored
Commits on Mar 10, 2014
  1. Fixed the jasmine issue by modifying the vm's context

    Chris Moultrie authored
  2. Un-broke the setInterval/setTimeout

    Chris Moultrie authored
  3. Added a noop to onComplete Defaults

    Chris Moultrie authored
  4. Updating the docs and such

    Chris Moultrie authored
  5. Removed old commented line

    Chris Moultrie authored
  6. Removing unused arg

    Chris Moultrie authored
  7. Adding travis support

    Chris Moultrie authored
  8. Auto build stuff, please work

    Chris Moultrie authored
  9. Merge branch 'master' into Jasmine2.0

    Chris Moultrie authored
    Conflicts:
    	.travis.yml
  10. Adding dep status image

    Chris Moultrie authored
  11. ugh

    Chris Moultrie authored
  12. More changes

    Chris Moultrie authored
Commits on Mar 11, 2014
  1. minor changes, starting work on junit reporter

    Chris Moultrie authored
  2. More newlines

    Chris Moultrie authored
Commits on Mar 12, 2014
  1. Debug flag, file-finder cleanup/trimming

    Chris Moultrie authored
  2. Stop mangling the filename

    Chris Moultrie authored
Commits on Mar 13, 2014
  1. Modifications to make done misconfiguration better..er

    Chris Moultrie authored
  2. Minor reporter changes

    Chris Moultrie authored
  3. More reporter cleanup

    Chris Moultrie authored
  4. Updated unit test

    Chris Moultrie authored
  5. Grunt test and cleanup

    Chris Moultrie authored
Commits on Mar 14, 2014
  1. Temporary workaround for done/return issue

    Chris Moultrie authored
Commits on Mar 15, 2014
  1. Cleanup, refactor, more testing

    Chris Moultrie authored
Commits on Mar 21, 2014
  1. trying to get CI to work

    Chris Moultrie authored
Commits on Apr 19, 2014
  1. Merge branch 'master' of github.com:mhevery/jasmine-node into Jasmine2.0

    Chris Moultrie authored
    Conflicts:
    	README.md
    	lib/jasmine-node/cli.js
    	lib/jasmine-node/index.js
    	lib/jasmine-node/reporter.js
    	package.json
  2. Adding Jasmine-Reporters commit-ish

    Chris Moultrie authored
  3. Junit Starting

    Chris Moultrie authored
  4. JUnit Config works

    Chris Moultrie authored
  5. Ignoring reports folder

    Chris Moultrie authored
  6. Upgraded jasmine-reporters and fixed color/TTY issue with autoRun

    Chris Moultrie authored
    Resolves #306
  7. Comments!

    Chris Moultrie authored
  8. Now supporting nunit as well

    Chris Moultrie authored
  9. NPM Publishing 2.0.0-beta4

    Chris Moultrie authored
Something went wrong with that request. Please try again.