Skip to content

John McEleney / casperjs

Go to a project
Toggle navigation
Toggle navigation pinning
Commit baafcfe2 baafcfe2af669ddc60ef29d0b66aa842a0525c38 by Nicolas Perriault
Options

renamed `popup` module to `pagestack` 

to ease future reusability.
1 parent ce54777a
Inline Side-by-side
Showing 3 changed files with 5 additions and 171 deletions
......@@ -35,7 +35,7 @@ var events = require('events');
var fs = require('fs');
var http = require('http');
var mouse = require('mouse');
var popup = require('popup');
var pagestack = require('pagestack');
var qs = require('querystring');
var tester = require('tester');
var utils = require('utils');
......@@ -140,7 +140,7 @@ var Casper = function Casper(options) {
this.mouse = mouse.create(this);
this.page = null;
this.pendingWait = false;
this.popups = popup.createStack();
this.popups = pagestack.create();
this.requestUrl = 'about:blank';
this.resources = [];
this.result = {
......@@ -1397,7 +1397,7 @@ Casper.prototype.start = function start(location, then) {
this.log('Starting...', "info");
this.startTime = new Date().getTime();
this.history = [];
this.popups = popup.createStack();
this.popups = pagestack.create();
this.steps = [];
this.step = 0;
// Option checks
......
/*!
* Casper is a navigation utility for PhantomJS.
*
* Documentation: http://casperjs.org/
* Repository: http://github.com/n1k0/casperjs
*
* Copyright (c) 2011-2012 Nicolas Perriault
*
* Part of source code is Copyright Joyent, Inc. and other Node contributors.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
*/
/*global CasperError console exports phantom require*/
var utils = require('utils');
var f = utils.format;
function createStack() {
"use strict";
return new Stack();
}
exports.createStack = createStack;
/**
* Popups container. Implements Array prototype.
*
*/
var Stack = function Stack(){};
exports.Stack = Stack;
Stack.prototype = [];
/**
* Cleans the stack from closed popup.
*
* @param WebPage closed Closed popup page instance
* @return Number New stack length
*/
Stack.prototype.clean = function clean(closed) {
"use strict";
var closedIndex = -1;
this.forEach(function(popup, index) {
if (closed === popup) {
closedIndex = index;
}
});
if (closedIndex > -1) {
this.splice(closedIndex, 1);
}
return this.length;
};
/**
* Finds a popup matching the provided information. Information can be:
*
* - RegExp: matching page url
* - String: strict page url value
* - WebPage: a direct WebPage instance
*
* @param Mixed popupInfo
* @return WebPage
*/
Stack.prototype.find = function find(popupInfo) {
"use strict";
var popup, type = utils.betterTypeOf(popupInfo);
switch (type) {
case "regexp":
popup = this.findByRegExp(popupInfo);
break;
case "string":
popup = this.findByURL(popupInfo);
break;
case "qtruntimeobject": // WebPage
popup = popupInfo;
if (!utils.isWebPage(popup) || !this.some(function(popupPage) {
if (popupInfo.id && popupPage.id) {
return popupPage.id === popup.id;
}
return popupPage.url === popup.url;
})) {
throw new CasperError("Invalid or missing popup.");
}
break;
default:
throw new CasperError(f("Invalid popupInfo type: %s.", type));
}
return popup;
};
/**
* Finds the first popup which url matches a given RegExp.
*
* @param RegExp regexp
* @return WebPage
*/
Stack.prototype.findByRegExp = function findByRegExp(regexp) {
"use strict";
var popup = this.filter(function(popupPage) {
return regexp.test(popupPage.url);
})[0];
if (!popup) {
throw new CasperError(f("Couldn't find popup with url matching pattern %s", regexp));
}
return popup;
};
/**
* Finds the first popup matching a given url.
*
* @param String url The child WebPage url
* @return WebPage
*/
Stack.prototype.findByURL = function findByURL(string) {
"use strict";
var popup = this.filter(function(popupPage) {
return popupPage.url.indexOf(string) !== -1;
})[0];
if (!popup) {
throw new CasperError(f("Couldn't find popup with url containing '%s'", string));
}
return popup;
};
/**
* Returns a human readable list of current active popup urls.
*
* @return Array Mapped stack.
*/
Stack.prototype.list = function list() {
"use strict";
return this.map(function(popup) {
try {
return popup.url;
} catch (e) {
return '<deleted>';
}
});
};
/**
* String representation of current instance.
*
* @return String
*/
Stack.prototype.toString = function toString() {
"use strict";
return f("[Object Stack], having %d popup(s)" % this.length);
};
/*jshint strict:false*/
/*global CasperError casper console phantom require*/
var popup = require('popup');
var pagestack = require('pagestack');
var utils = require('utils');
var webpage = require('webpage');
var t = casper.test;
var stack = popup.createStack();
var stack = pagestack.create();
var page1 = webpage.create();
......