Skip to content

Commit

Permalink
Merge pull request #182 from algolia/chore/upgrade-all-deps-2017-05-22
Browse files Browse the repository at this point in the history
chore(deps): update all deps
  • Loading branch information
vvo authored May 22, 2017
2 parents 5c94325 + 06cbbc0 commit ca49516
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 123 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ env:
- TEST_SUITE=integration BROWSER='safari:6'
- TEST_SUITE=integration BROWSER='safari:7'
- TEST_SUITE=integration BROWSER='safari:8'
- TEST_SUITE=integration BROWSER='internet explorer:8'
- TEST_SUITE=integration BROWSER='internet explorer:9'
- TEST_SUITE=integration BROWSER='internet explorer:10'
- TEST_SUITE=integration BROWSER='internet explorer:11'
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"url": "https://github.com/algolia/autocomplete.js.git"
},
"devDependencies": {
"angular": "^1.6.3",
"angular-mocks": "^1.6.3",
"babel-eslint": "^7.2.1",
"angular": "^1.6.4",
"angular-mocks": "^1.6.4",
"babel-eslint": "^7.2.3",
"chai": "^3.5.0",
"colors": "^1.1.2",
"conventional-changelog-cli": "^1.3.1",
Expand All @@ -27,7 +27,7 @@
"grunt-banner": "^0.6.0",
"grunt-cli": "1.2.0",
"grunt-concurrent": "^2.3.1",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-clean": "^1.1.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-uglify": "^2.2.0",
Expand All @@ -39,12 +39,12 @@
"grunt-umd": "^2.3.6",
"grunt-webpack": "^1.0.14",
"istanbul-instrumenter-loader": "^1.0.0",
"jasmine-core": "^2.5.2",
"jasmine-core": "^2.6.2",
"jasmine-jquery": "^2.1.1",
"jquery": "^3.2.1",
"json": "^9.0.6",
"karma": "^1.5.0",
"karma-chrome-launcher": "^2.0.0",
"karma": "^1.7.0",
"karma-chrome-launcher": "^2.1.1",
"karma-coverage": "^1.1.1",
"karma-coveralls": "^1.1.2",
"karma-firefox-launcher": "^1.0.1",
Expand All @@ -55,7 +55,7 @@
"karma-sinon": "^1.0.5",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.3",
"mocha": "^3.0.2",
"mocha": "^3.4.1",
"mversion": "^1.10.1",
"node-static": "^0.7.8",
"phantomjs-prebuilt": "^2.1.12",
Expand Down
4 changes: 2 additions & 2 deletions test/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set -e # exit when error, no verbose
if [ "$TEST_SUITE" == "unit" ]; then
./node_modules/karma/bin/karma start --single-run
elif [ "$TRAVIS_SECURE_ENV_VARS" == "true" -a "$TEST_SUITE" == "integration" ]; then
static -p 8888 &
sleep 3
static -p 8080 &
sleep 3 &&
./node_modules/mocha/bin/mocha --harmony -R spec ./test/integration/test.js
else
echo "Not running any tests"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe('jquery-typeahead.js', function() {

driver.run(function*() {
yield this.init(caps);
yield this.get((env['TEST_HOST'] || 'http://localhost:8888') + '/test/integration/test.html');
yield this.get((env['TEST_HOST'] || 'http://localhost:8080') + '/test/integration/test.html');

body = this.elementByTagName('body');
input = yield this.elementById('states');
Expand Down
Loading

0 comments on commit ca49516

Please sign in to comment.