Skip to content

Commit

Permalink
closes #335 - dropped support for phantomjs 1.6 (1.7 & 1.8 are both s…
Browse files Browse the repository at this point in the history
…upported)
  • Loading branch information
n1k0 committed Dec 23, 2012
1 parent 6946464 commit d3cd903
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ CasperJS Changelog
XXXX-XX-XX, v1.0.0
------------------

### Important Changes & Caveats

- PhantomJS 1.6.x support has been dropped. Both PhantomJS 1.7 & 1.8 will be supported.

### Bugfixes & enhancements

- fixed `page.initialized` event didn't get the initialized `WebPage` instance
- fixed a bug preventing `Casper.options.onPageInitialized()` from being called
- fixed [#215](https://github.com/n1k0/casperjs/issues/215) - fixed broken `--fail-fast` option creating an endless loop on error
Expand Down
4 changes: 2 additions & 2 deletions bin/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ if (!phantom) {
phantom.exit(1);
}

if (phantom.version.major === 1 && phantom.version.minor < 6) {
console.error('CasperJS needs at least PhantomJS v1.6.0 or later.');
if (phantom.version.major === 1 && phantom.version.minor < 7) {
console.error('CasperJS needs at least PhantomJS v1.7 or later.');
phantom.exit(1);
} else {
bootstrap(window);
Expand Down
2 changes: 1 addition & 1 deletion casperjs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ high-level functions, methods & syntaxic sugar for doing common tasks."
s.bindir = "rubybin"
s.executables = [ "casperjs" ]
s.license = "MIT"
s.requirements = [ "PhantomJS v1.6" ]
s.requirements = [ "PhantomJS v1.7" ]
end
3 changes: 0 additions & 3 deletions modules/casper.js
Original file line number Diff line number Diff line change
Expand Up @@ -1343,9 +1343,6 @@ Casper.prototype.runStep = function runStep(step) {
*/
Casper.prototype.sendKeys = function(selector, keys, options) {
"use strict";
if (phantom.version.major === 1 && phantom.version.minor < 7) {
throw new CasperError('sendKeys() requires PhantomJS >= 1.7');
}
this.checkStarted();
options = utils.mergeObjects({
eventType: 'keypress'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
],
"dependencies": {
"http://www.phantomjs.org/": "1.6"
"http://www.phantomjs.org/": "1.7"
},
"bugs": {
"url": "https://github.com/n1k0/casperjs/issues"
Expand Down
5 changes: 0 additions & 5 deletions tests/suites/casper/keys.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
/*jshint strict:false*/
/*global CasperError casper console phantom require*/
if (phantom.version.major === 1 && phantom.version.minor < 7) {
casper.test.pass('Skipping tests for PhantomJS < 1.7');
casper.test.done(1);
}

casper.start('tests/site/form.html', function() {
this.sendKeys('input[name="email"]', '[email protected]');
this.sendKeys('textarea', "Damn, I’m looking good.");
Expand Down

0 comments on commit d3cd903

Please sign in to comment.