Skip to content

Commit

Permalink
Merge pull request #1282 from waterbearlang/fix_phantomjs_tests
Browse files Browse the repository at this point in the history
fix phantomjs tests
  • Loading branch information
dethe committed Nov 18, 2015
2 parents a70f5f0 + f7e27cf commit 1221815
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 60 deletions.
16 changes: 16 additions & 0 deletions js/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@
return false;
}

if (!CustomEvent){
var CustomEvent = function CustomEvent ( event, params ) {
params = params || { bubbles: false, cancelable: false, detail: undefined };
var evt = document.createEvent( 'CustomEvent' );
evt.initCustomEvent( event, params.bubbles, params.cancelable, params.detail );
return evt;
}
CustomEvent.prototype = window.Event.prototype;
window.CustomEvent = CustomEvent;
}

// Move these to utils.js

// Maintain references to events so we can mass-remove them later
Expand Down Expand Up @@ -225,6 +236,11 @@
/* Add custom events for adding and removing blocks from the DOM */
function registerElementsForAddRemoveEvents(root, eventPrefix, parentList, childList){

if (typeof MutationObserver === 'undefined'){
console.warn('If you see this and you are not running tests in PhantomJS you have problems');
return;
}

var blockObserver = new MutationObserver(function(mutations){
mutations.forEach(function(mutation){
// send childAdded or childRemove event to parent element
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"test": "test"
},
"scripts": {
"test": "./node_modules/karma/bin/karma start karma.conf.js"
"test": "phantomjs test/all-blocks-have-functions.js ; karma start test/karma.conf.js",
"start": "echo \"open http://localhost:8000/playground.html in your web browser\";static -p 8000"
},
"repository": {
"type": "git",
Expand All @@ -27,6 +28,7 @@
"karma-coverage": "^0.5.2",
"karma-phantomjs-launcher": "^0.2.1",
"karma-qunit": "^0.1.5",
"node-static": "^0.7.7",
"parse5": "^1.5.0",
"phantomjs": "^1.9.18",
"qunitjs": "^1.19.0"
Expand Down
15 changes: 0 additions & 15 deletions run_tests.sh

This file was deleted.

11 changes: 2 additions & 9 deletions test/all-blocks-have-functions.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
/**
* Use with PhantomJS:
*
* phantomjs test/all-blocks-have-functions.js playground.html
* phantomjs test/all-blocks-have-functions.js
*
* Tests if all blocks in the page sidebar have defined functions.
*/
var webPage = require('webpage');
var system = require('system');
var pageName;

if (system.args.length <= 1) {
console.error('Must provide playground.html');
phantom.exit(-1);
} else {
pageName = system.args[1];
}
var pageName = 'playground.html';

var page = webPage.create();

Expand Down
4 changes: 2 additions & 2 deletions karma.conf.js → test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function(config) {
config.set({

// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',
basePath: '..',


// frameworks to use
Expand All @@ -29,7 +29,7 @@ module.exports = function(config) {
'test/test-helpers.js',
'test/sinon-1.12.2.js',
'test/runtime.js',
//'test/all-blocks-have-functions.js'
// 'test/all-blocks-have-functions.js'
],


Expand Down
24 changes: 0 additions & 24 deletions test/runtime.html

This file was deleted.

18 changes: 9 additions & 9 deletions test/runtime.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ QUnit.test('copy', function(assert){
assert.ok(copy[0] !== original[2]);
});
QUnit.test('itemAt', function(assert){
var array = runtime.array;
var array = runtime.array;
var image = runtime.image.get('images/mascot/mascot-steampunk.png');
var sprite = runtime.sprite.create();
var original = ['item1',image,sprite];
Expand All @@ -71,7 +71,7 @@ QUnit.test('makeString', function(assert){
assert.ok(sentence === "the,boy,went");
});
QUnit.test('append', function(assert){
var array = runtime.array;
var array = runtime.array;
var image = runtime.image.get('images/mascot/mascot-steampunk.png');
var sprite = runtime.sprite.create();
var appended = ['item1',sprite];
Expand All @@ -83,7 +83,7 @@ QUnit.test('append', function(assert){
assert.ok(appended[3] === image);
});
QUnit.test('prepend', function(assert){
var array = runtime.array;
var array = runtime.array;
var image = runtime.image.get('images/mascot/mascot-steampunk.png');
var sprite = runtime.sprite.create();
var prependArray = ['item1',sprite];
Expand All @@ -95,22 +95,22 @@ QUnit.test('prepend', function(assert){
assert.ok(prependArray[3] === sprite);
});
QUnit.test('length', function(assert){
var array = runtime.array;
var array = runtime.array;
var lengthArray = ['one','two','three'];
assert.ok(array.length(lengthArray) === 3);
});
QUnit.test('removeItem', function(assert){
var array = runtime.array;
var array = runtime.array;
var image = runtime.image.get('images/mascot/mascot-steampunk.png');
var sprite = runtime.sprite.create();
var array1 = ['item1',image,sprite];
array.removeItem(array1,1);
assert.ok(array1[0] === 'item1');
assert.ok(array1[1] === sprite);
assert.ok(array1.length === 2);
assert.ok(array1.length === 2);
});
QUnit.test('pop', function(assert){
var array = runtime.array;
var array = runtime.array;
var image = runtime.image.get('images/mascot/mascot-steampunk.png');
var sprite = runtime.sprite.create();
var array1 = ['item1',image,sprite];
Expand All @@ -120,7 +120,7 @@ QUnit.test('pop', function(assert){
assert.ok(array1.length === 2);
});
QUnit.test('shift', function(assert){
var array = runtime.array;
var array = runtime.array;
var image = runtime.image.get('images/mascot/mascot-steampunk.png');
var sprite = runtime.sprite.create();
var array1 = ['item1',image,sprite];
Expand All @@ -130,7 +130,7 @@ QUnit.test('shift', function(assert){
assert.ok(array1.length === 2);
});
QUnit.test('reverse', function(assert){
var array = runtime.array;
var array = runtime.array;
var image = runtime.image.get('images/mascot/mascot-steampunk.png');
var sprite = runtime.sprite.create();
var array1 = ['item1',image,sprite];
Expand Down

0 comments on commit 1221815

Please sign in to comment.