Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: metaskills/mocha-phantomjs
base: df8376f397
...
head fork: metaskills/mocha-phantomjs
compare: master
Commits on Nov 20, 2012
Kevin Decker kpdecker Allow for explicit user agents 94828ad
Kevin Decker kpdecker Merge branch 'ut-fixup' 1a892d3
Commits on Nov 21, 2012
Kevin Decker kpdecker Allow arbitrary return codes from fail 25d35a0
Kevin Decker kpdecker Allow arbitrary config in runner process e235b36
Kevin Decker kpdecker Implement startup timeout d1b76c1
Kevin Decker kpdecker Allow arbitrary config in runner process
Conflicts:
	bin/mocha-phantomjs
	lib/mocha-phantomjs.coffee
9836269
Commits on Nov 22, 2012
Kevin Decker kpdecker Merge remote-tracking branch 'upstream/master' into generic-user-agen…
…t-string
bd9a916
Ken Collins Merge pull request #20 from kpdecker/user-agent-string
Allow for explicit user agents
0102c63
Ken Collins Preparing for 1.1.0 release. b02d889
Kevin Decker kpdecker Fixup user agent declaration ece9d55
Kevin Decker kpdecker Handle tests that end immediately c411160
Kevin Decker kpdecker Allow viewportSize configuration 13c2b3c
Kevin Decker kpdecker Allow custom cookies c1173c1
Kevin Decker kpdecker Allow custom setting parameters 6e17cd6
Kevin Decker kpdecker Add header set support b459105
Kevin Decker kpdecker Merge branch 'additional-config' 96235d4
Kevin Decker kpdecker Merge branch 'timeout'
Conflicts:
	bin/mocha-phantomjs
	lib/mocha-phantomjs.coffee
11ff082
Kevin Decker kpdecker Match test name with others bbb4ce0
Kevin Decker kpdecker Add mocha opts 7736e28
Kevin Decker kpdecker Merge branch 'master' of github.com:metaskills/mocha-phantomjs
Conflicts:
	lib/mocha-phantomjs.coffee
6e00eed
Commits on Nov 26, 2012
Ken Collins Fix a few test HTML titles. 9504f56
Ken Collins Build green. More Mocha 1.7 checkmark changes. 9f091cc
Commits on Dec 02, 2012
Kevin Decker kpdecker Update CLI args in README 7039696
Commits on Dec 03, 2012
Ken Collins Prepare for 1.1.0 release. 421c3f5
Commits on Dec 08, 2012
Ken Collins Fixes #25. Prepare for 1.1.1 release. de1f03d
Commits on Dec 12, 2012
Ken Collins Update docs with better installation/usage. 8d6ab7d
Commits on Dec 18, 2012
Dominic Barnes dominicbarnes adding a conditional, so this html is able to be loaded purely as a b…
…lank target for an iframe
8418bfe
Dominic Barnes dominicbarnes adding a test case for iframe manipulation, specifically to show the …
…failure when an iframe that fails to download bubbles up and causes the entire page loaded to look like it failed to download
f63bfdf
Dominic Barnes dominicbarnes fixing up the tests some, and adding a fix to the main lib, basically…
… resetting the onLoadFinished handler so subsequent calls (triggered by iframes) do not cause the whole page to fail
bde0a87
Commits on Dec 19, 2012
Matt Robenolt mattrobenolt Install phantomjs locally 6374e7f
Matt Robenolt mattrobenolt Correctly seatch all module paths for local phantom 0b07eac
Matt Robenolt mattrobenolt I suck at Javascripting 9dfc95b
Matt Robenolt mattrobenolt Fall back to a global phantomjs if a local version isn't found 75d3eef
Matt Robenolt mattrobenolt DRY aeaa5f1
Kevin Decker kpdecker Merge pull request #33 from dominicbarnes/master
IFrame failure/abort causes the page to appear like it failed to load
811d20b
Ken Collins Update change log with iframe fix and a few line changes. 5f54f0c
Ken Collins Merge pull request #32 from mattrobenolt/no-global-phantom
Install phantomjs locally
5fad40c
Ken Collins Allow a local npm of phantomjs to work. 28ecde7
Commits on Jan 15, 2013
romario333 romario333 Fix error code 127 under Windows. 563ebb1
Commits on Jan 17, 2013
Ken Collins Small Travis change. Doc change. 2f44275
Ken Collins Merge pull request #36 from romario333/master
Fix error code 127 on Windows
5ac36f4
Ken Collins Add changelog note and TravisCI image. 7d86120
Ken Collins Prepare for 1.1.3. 9416bae
Commits on Jan 26, 2013
Ken Collins Use better inline integration hints using new -R option. 949e152
Ken Collins Lock down package.json to mocha 1.7, 1.8 after http://git.io/GYJCTw i…
…s resolved.

Notify if phantomjs is not installed. Fixes #41.
181d416
Ken Collins Update dev deps and docs. b3acde7
Commits on Jan 27, 2013
Nathan Black nathanboktae Remove mocha.opts since it doesn't work 5fdc3fb
Nathan Black nathanboktae -C, --no-color option to suppress color output f6fdf8f
Commits on Jan 30, 2013
Nathan Black nathanboktae Restore mocha.opts since it is used in by cake test 8aadd13
Commits on Mar 05, 2013
Ken Collins Merge pull request #38 from nathanboktae/nocoloropt
Option to remove colors like mocha's --no-color
0f98fa4
Ken Collins Update generated test JS form previous commits. 175198d
Ken Collins Prepare for 2.0.1 release. 2b79b8c
Commits on Mar 09, 2013
Michael Dripps midripps Spawn coffee.cmd and mocha.cmd on Windows 0dd47e3
Michael Dripps midripps Spawn node command explicitly as Windows doesn't do shebang. 35410fc
Michael Dripps midripps Change to fullPath function to form correct 'file:' urls on Windows. d910650
Michael Dripps midripps Changed some expect calls to be less sensitive to control chars which…
… are different on Windows.
37a0c25
Michael Dripps midripps Change to regex in dot reporter wrap test to support Windows cr/lf. 5128024
Michael Dripps midripps Remove '\n' from user agent test expect calls to support Windows 72165f6
Commits on Mar 10, 2013
Ken Collins Merge pull request #48 from midripps/windows
Support build and test on Windows
80ccc0f
Commits on Mar 24, 2013
Ken Collins Tested with Mocha 1.8.2. Fixes #37. d13719d
Ken Collins Tested with Chai 1.5.0. Fixed #30. 73ff641
Ken Collins Tested with PhantomJS 1.9.0. 9a96796
Ken Collins Change --cookie to --cookies and take full object. Fixes #31. ff4fabf
Ken Collins Fix broken test. d02c97c
Commits on Apr 16, 2013
Ken Collins Use PhantomJS 1.9.1 features for std{in,out,error}. ce7af35
Sheldon Hearn sheldonh Clarify phantomjs dependency b38442a
Sheldon Hearn sheldonh Mark script up correctly 8e36e29
Ken Collins Merge pull request #56 from sheldonh/missing_phantomjs
Clarify phantomjs dependency
5df2298
Commits on May 14, 2013
Arian Stolwijk arian Change customizeProcessStdout to customizeConsole for List reporter
It had to customizeProcessStdout methods in the same class. Changing it to customizeConsole like the Spec reporter.
b0cfa68
Ken Collins Merge pull request #62 from arian/patch-1
Change customizeProcessStdout to customizeConsole for List reporter
fa3769d
Ken Collins Prepare for 2.0.2 release. 3848f94
Commits on May 16, 2013
ethanselzer ethanselzer Clarify settings in readme usage section
Add a link to phantomjs WebPage settings
Add an example of using multiple setting arguments
a22daa8
Ken Collins Merge pull request #63 from ethanselzer/settings-documentation
Clarify settings in readme usage section. Fixes #63. Fixes #59.
659e162
Commits on May 18, 2013
Alexey Kuzmin alexeykuzmin Add ability to use specific PhantomJS binary via "path" argument aca2d17
Alexey Kuzmin alexeykuzmin Update README with "-p" arg description and example c6ec5fc
Commits on May 19, 2013
Ken Collins Merge pull request #64 from alexeykuzmin/patch-1
Add ability to use specific PhantomJS binary via "path" argument
f30affe
Commits on Jun 06, 2013
Alex Gorbatchev alexgorbatchev Should fail when there is a page error 5cb72d4
Ken Collins Merge pull request #68 from alexgorbatchev/master
Should fail when there is a page error
1d1c4ab
Ken Collins Prepare for v2.0.3. 0453d9f
Commits on Jun 07, 2013
Ken Collins Merge branch 'master' into phantomjs19
Conflicts:
	lib/mocha-phantomjs.coffee
9a918ea
Ken Collins Prepare for 3.0.0 release. aaef1c1
Ken Collins Prepare for 3.0.0 release. f096f57
Ken Collins Merge branch 'phantomjs19' 02c024b
Ken Collins Remove all Reporter subclasses.
* All reporter args should likely just work.
* Fixes #66. Fixes #49.
6a503d4
Ken Collins Note windows download vs npm install. d895f7b
Commits on Jun 14, 2013
Ken Collins Add a link to mocha for Mocha.process hook. Fixed #72. 4dc1980
Commits on Jun 16, 2013
Nathan Black nathanboktae fix crash with referencing undefined cookie array when running phanto…
…mjs directly
a17c0bb
Commits on Jul 01, 2013
Di Wu use mocha 1.12.x c0ca554
Ken Collins Merge pull request #74 from diwu1989/freshMocha
Use mocha 1.12.x
5dce31b
Ken Collins Prepare for v3.1.0 release. 042dd0f
Commits on Aug 14, 2013
Jed Mao jedmao Produce Mocha.process.stdout if it doesn't exist 471314a
Ken Collins Merge pull request #89 from jedhunsaker/master
Produce Mocha.process.stdout if it doesn't exist
a66377b
Commits on Aug 20, 2013
Kazuhito Hokamura hokaccha Add window.mochaPhantomJS.env e7b1582
Commits on Aug 21, 2013
Kazuhito Hokamura hokaccha Add a env test 83f342b
Commits on Aug 22, 2013
Ken Collins Merge pull request #91 from hokaccha/topic/set-env
Add window.mochaPhantomJS.env
fa0d6d8
Ken Collins Update CHANGELOG and prepare 3.1.2 release. 52fd9b2
Commits on Sep 22, 2013
Jonathan Chapman chafnan Added more to gitignore to ignore intellij files c09cfe2
Jonathan Chapman chafnan Added check for phantomjs in the path before it looks it the modules …
…path.
897f46e
Jonathan Chapman chafnan Made fixes to tests to get them working on a windows machine 2befcff
Jonathan Chapman chafnan Added name to contributers list af705e0
Jonathan Chapman chafnan Finished comment a8429b2
Jonathan Chapman chafnan Fixed formatting in the package and set dep on which 00b9c10
Jonathan Chapman chafnan Removed unneeded require on os c911290
Jonathan Chapman chafnan Forgot to build the project 9991575
Ken Collins Merge pull request #94 from chafnan/master
Added check to find phantomjs in the path before looking in the module path. Fixes #92.
2233a5a
Ken Collins Do not ignore things that should be in your global ignore. d2cf2cf
Ken Collins Note 3.1.3 change log. 320d8e2
Ken Collins Prepare for 3.1.3 release. d578e2d
Ken Collins Small comment cleanup. 426562e
Ken Collins Test with Chai.js v1.8.x 05c6c73
Ken Collins Test with Mocha.js v1.13.x b71c3a6
Jonathan Chapman chafnan fix #65: Added message back to user whet the path given is does not e…
…xist
966e006
Jonathan Chapman chafnan Cleaned path test code from wrong indent 90b601c
Jonathan Chapman chafnan Merge remote-tracking branch 'upstream/master' 5f924f4
Commits on Sep 24, 2013
Jonathan Chapman chafnan Updated exit if path argument not found to just be a warning. Moved t…
…he warning to be in the stdout
242a267
Jonathan Chapman chafnan working on windows 1246fea
Commits on Sep 25, 2013
Jonathan Chapman chafnan fixes #92: handled issue that which throws error if path was not found 065b6a0
Commits on Sep 26, 2013
Ken Collins Merge pull request #95 from chafnan/master
fix #65: Added message back to user when the path given does not exist
08f57df
Ken Collins Prepare for 3.1.4 release. 5808a33
Commits on Sep 30, 2013
Ulf Liedberg uliedberg Add test for reporting of failing async tests
The done() calls are superfluous but simply looks neater &
disregards the underlying assertion failing mechanism.
d6f8106
Ulf Liedberg uliedberg Fix reporting of failing async tests
This lets mocha handle uncaught exceptions thrown in async tests,
enabling the completion of a test suite with such errors.
6ecfe26
Commits on Oct 03, 2013
Ken Collins Merge pull request #97 from uliedberg/report_all_failing_async_tests
Report all failing async tests
279edce
Ken Collins Prepare for 3.1.5 release. 470689b
Commits on Oct 22, 2013
Joel Leibow Adding in commander option for hooks module path. 30768b1
Joel Leibow joelleibow Adding provided hooks module path to config object. d966eb2
Joel Leibow joelleibow Loading hooks onto instance and calling onEnd, if provided. 8f306fd
Commits on Nov 04, 2013
Joel Leibow joelleibow Removing hooks from config and passing as arg to child process. 78ea24a
Joel Leibow joelleibow defaulting hooks to an empty JSON object string. e6c0800
Commits on Nov 06, 2013
Nathan Black nathanboktae Check phantom.version to help prevent issues like #93 0830f5a
Joel Leibow joelleibow Resolving hooks to absolute path, if provided. 0ff5925
Nathan Black nathanboktae Prepare for 3.1.6 release 0f97426
Commits on Nov 07, 2013
Ken Collins Prepare for 3.1.6 release. 76f9593
Commits on Nov 26, 2013
Romain Filirom1 Log resourceError a745327
Commits on Nov 27, 2013
Romain Filirom1 log friendly messages on Resource Error d0131a6
Commits on Nov 28, 2013
Nathan Black nathanboktae Merge pull request #109 from Filirom1/patch-2
Log resourceError
d037a3d
Ken Collins Prepare for 3.1.7 release. 33e9759
Commits on Dec 01, 2013
Nathan Black nathanboktae --file option for piping reporter output to a file 376877a
Nathan Black nathanboktae bump node version to 0.10.x cb6578c
Commits on Dec 04, 2013
Joel Leibow joelleibow Support and tests for beforeStart hook 01b0fee
Joel Leibow joelleibow Semantic tweaks to before start hook 8a29553
Joel Leibow joelleibow Support and tests for afterEnd hook f2499e5
Joel Leibow joelleibow Per metaskills, using idiomatic CoffeeScript b973448
Commits on Dec 09, 2013
Joel Leibow joelleibow Pulling in executable changes. debfbae
Joel Leibow joelleibow Work was done on master. Reverting to pre-changes. Will edit and push…
… in new changes.
0932f0d
Joel Leibow joelleibow Changes necessary for hooks included via executable. cd3d86e
Joel Leibow joelleibow Resolving system.arg conditional check. Value provided is string. 0bcd636
Joel Leibow joelleibow Moving hooks into config arg 45c6b61
Nathan Black nathanboktae Merge pull request #113 from joelleibow/page-eval-hooks
Page eval hooks
2bcb49d
Nathan Black nathanboktae Merge pull request #111 from metaskills/reporter-file-output
--file option for piping reporter output to a file
2fa6095
Nathan Black nathanboktae Prepare for 3.2.0 release a16d420
Nathan Black nathanboktae Updated usage and removed a completed TODO 948e99f
Commits on Dec 13, 2013
Nathan Black nathanboktae Support third party reporters 3f6223f
Nathan Black nathanboktae Updated documentation for reporters, and more robust wrapping of 3rd …
…party reporters
5c5b972
Nathan Black nathanboktae Merge pull request #115 from metaskills/third-party-reporters
Support third party reporters
b82c2be
Nathan Black nathanboktae prepare for 3.3.0 release 9556d2f
Commits on Dec 22, 2013
Nathan Black nathanboktae Send phantomjs stderr to stderr not stdout. Fixes #116 bd949b7
Nathan Black nathanboktae Leaner, healthier development - no cake, no build edb4cc4
Commits on Jan 02, 2014
Ken Collins Prepare for v3.3.1 6fe3d05
Commits on Jan 26, 2014
Nathan Black nathanboktae Return runner from mochaPhantomJS.run(). Fixes #118 aa40310
Nathan Black nathanboktae Merge branch 'master' of https://github.com/metaskills/mocha-phantomjs 49ca3ea
Commits on Feb 12, 2014
j0tunn j0tunn Exit with 1 if no exitcode at all 4cab1cf
j0tunn j0tunn Formatting 6db8279
j0tunn j0tunn Return -1 (255) in case of phantom crash bd734fe
Nathan Black nathanboktae Merge pull request #121 from cody-/master
Exit with -1 if no exit code at all
9c9083f
Ken Collins Release v3.3.2 a5ae463
Commits on Apr 27, 2014
Nathan Black nathanboktae Add phantomjs as a peer dependency fd6cbad
Commits on Apr 30, 2014
Nathan Black nathanboktae Use require.resolve to properly look up the phantomjs path 18dae39
Commits on May 08, 2014
Nathan Black nathanboktae Merge pull request #132 from metaskills/phantom-peer-dependency
Add phantomjs as a peer dependency
43a26ae
Commits on May 14, 2014
Jimmy Schementi jschementi Ensure that a custom reporter is a file
Fixes the case where mocha-phantomjs is run from a directory that has a
`spec` directory.
8eaf6e1
Nathan Black nathanboktae Merge pull request #134 from jschementi/master
Ensure that a custom reporter is a file
65aac32
Commits on May 16, 2014
Nathan Black nathanboktae Use the phantomjs module correctly. Fixes #136 dbf62e6
Nathan Black nathanboktae Release v3.4.1 ce4e884
Commits on Jun 17, 2014
Nathan Black nathanboktae Robustly handle phantomjs callbacks. Fixes #140 355e737
Commits on Jun 23, 2014
Nathan Black nathanboktae Provide a more informative error if an error occurs while launching p…
…hantomjs. Fixes #141
61000de
Commits on Jun 24, 2014
Nathan Black nathanboktae Upgrade mocha to ~1.20.1 and commander to ~2.0.0. Fixes #143 15d96b3
Nathan Black nathanboktae Add a test for --no-colors. fixes #137 2238d58
Commits on Jun 25, 2014
Nathan Black nathanboktae Prepare for 3.5.0 release e7119cf
Commits on Aug 12, 2014
Daan Wissing daanwissing Improve PhantomJS version check so PhantomJS 2 can be used as well. e2ad697
Daan Wissing daanwissing Fix silly comparison bug (my coffeescript skills are inferior) 44a3c6f
Nathan Black nathanboktae Merge pull request #148 from daanwissing/master
Improve PhantomJS version check so PhantomJS 2 can be used as well.
f985a94
Commits on Sep 26, 2014
Josip Janžić janza fixed keyval parser to support multiple '=' signs 3267b43
Josip Janžić janza added test for 3267b43 8d95c86
Nathan Black nathanboktae Merge pull request #155 from janza/master
Fixed keyval parser to support multiple '=' signs
b150243
Commits on Oct 07, 2014
Nathan Black nathanboktae Prepare for 3.5.1 release 41d6eb3
Commits on Nov 30, 2014
Nathan Black nathanboktae Add the bail option for feature parity with mocha. Fixes #157 8641736
Commits on Dec 04, 2014
Pasi Huhtiniemi huhtari Add screen capture support 0291907
Juha Paananen raimohanska don't prefix screenshot name, to allow custom naming scheme and allow…
… directory prefix etc
5a41fd3
Juha Paananen raimohanska describe screenshots in README.md db756d7
Juha Paananen raimohanska add test for screenshot ff016a9
Juha Paananen raimohanska simplify screenshot 6e68d39
Juha Paananen raimohanska improve test description a2272b2
Nathan Black nathanboktae Merge pull request #165 from raimohanska/master
Support screenshot capturing
683d78c
Commits on Dec 05, 2014
Ken Collins Prepare for v3.5.2 1cf370d
Ken Collins Notes for v3.5.2 release. 887c770
Commits on Jan 04, 2015
Andrei Alecu andreialecu Add -i switch to hide resource errors from output 41e6dd7
Commits on Jan 05, 2015
Andrei Alecu andreialecu Rename switch to --ignore-resource-errors 1c97da3
Nathan Black nathanboktae Merge pull request #169 from andreialecu/switch-hiderequesterrors
Add --ignore-resource-errors switch to hide resource errors from output
71fdcaf
Commits on Jan 07, 2015
Nathan Black nathanboktae Add tests for --ignore-resource-errors 41190bf
Commits on Jan 08, 2015
Nathan Black nathanboktae forgot resource-errors.html for previous checkin 3444349
Commits on Jan 14, 2015
Nathan Black nathanboktae Implement the grep option, -g, and -i for inverting it. Fixes #145 48b81aa
Nathan Black nathanboktae Prepare for 3.5.3 Release 0ea826d
Nathan Black nathanboktae Document grep options 7f4bd07
Commits on Jan 26, 2015
Glen Cheney Vestride Update mocha links with new repository and site.
The mocha site now lives at http://mochajs.org. I replaced all the visionmedia links with the new ones.
745070c
Ken Collins Merge pull request #174 from Vestride/patch-1
Update mocha links with new repository and site.
42d17cd