Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[update-deps] Update dependencies #15

Merged
merged 5 commits into from
Mar 23, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.10"
- "12"
before_script:
- bash setup.sh
install:
Expand Down
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@
},
"author": "Elo7",
"dependencies": {
"elo7-doc-amd": "1.3.1"
"elo7-doc-amd": "1.5.1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agora j谩 est谩 na vers茫o 1.6.0

},
"devDependencies": {
"define-async": "1.3.2",
"eslint": "5.15.3",
"http-server": "0.11.1",
"mocha": "6.0.2",
"mocha-phantomjs": "4.1.0",
"phantomjs-prebuilt": "2.1.16",
"eslint": "6.8.0",
"http-server": "0.12.1",
"mocha": "7.1.0",
"mocha-chrome": "2.2.0",
"proclaim": "3.6.0"
}
}
2 changes: 1 addition & 1 deletion tearDown.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

ps aux | grep "[n]ode ./node_modules/http-server/bin/http-server -p 8888" | awk '{print $2}' | xargs kill -9;
ps aux | grep http-server | grep -v grep | awk '{print $2}' | xargs kill -9;
9 changes: 8 additions & 1 deletion test.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#!/bin/bash

./node_modules/mocha-phantomjs/bin/mocha-phantomjs -R spec -p ./node_modules/.bin/phantomjs "http://localhost:8888/test/formTest.js.html";
function finish {
./tearDown.sh
}

trap finish EXIT

./setup.sh
./node_modules/.bin/mocha-chrome -r spec http://localhost:8888/test/formTest.js.html
4 changes: 2 additions & 2 deletions test/formTest.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@
var $root, $form;

before(function() {
if(!HTMLElement.prototype.createShadowRoot) {
if(!HTMLElement.prototype.attachShadow) {
this.skip();
}
$root = $($('#form-shadow-root').first().createShadowRoot());
$root = $($('#form-shadow-root').first().attachShadow({ mode: 'open' }));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thompsoon

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

馃檲

$root.append($('#formClearMessages').first().cloneNode(true));
$form = $root.find('#formClearMessages');
});
Expand Down
5 changes: 2 additions & 3 deletions test/helpers.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/*eslint no-unused-vars: ["error", { "vars": "local" }]*/
/*global arrayEquals*/

//http://stackoverflow.com/a/14853974
function arrayEquals (a, b) {
window.arrayEquals = function(a, b) {
'use strict';

// if the other array is a falsy value, return
Expand All @@ -27,4 +26,4 @@ function arrayEquals (a, b) {
}

return true;
}
};