Skip to content

Commit

Permalink
(gce) improve e2e test start-up script (#2914)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielpeach authored Oct 28, 2016
1 parent 0de43ae commit 5f488b0
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
3 changes: 1 addition & 2 deletions test/google/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Deck end-to-end tests

The tests in this directory are a work in progress. They do not perfectly clean up the resources they create.
If you have not run these tests before, switch to a node version > 6,
then run `npm install` from this directory (not from the Deck project root).
If you have not run these tests before, run `npm install` from this directory (not from the Deck project root).
To run the tests, run `npm test` (from this directory).

1 change: 1 addition & 0 deletions test/google/e2e/tests/createServerGroup.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ describe('Create Server Group', function () {
The behavior inside the test does not match the behavior inside the protractor REPL.
*/
browser.actions().mouseDown(modal.imageSelector).perform();
browser.sleep(1000);
modal.firstImage.click();

// Scrolls down modal to instanceTypeSelector.
Expand Down
6 changes: 5 additions & 1 deletion test/google/google_int.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/bash
. ~/.nvm/nvm.sh

nvm install $npm_package_engines_node

./node_modules/protractor/bin/webdriver-manager update
protractor protractor.conf.js
./node_modules/protractor/bin/protractor protractor.conf.js

3 changes: 3 additions & 0 deletions test/google/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"scripts": {
"test": "sh ./google_int.sh"
},
"engines": {
"node": "6.5.0"
},
"author": "",
"license": "ISC",
"devDependencies": {
Expand Down
2 changes: 2 additions & 0 deletions test/google/tasks/createServerGroup/task.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

let job = require('./job.js'),
findImages = require('../utils/findImages'),
{ account, cloudProvider, region, zone } = require('../../config.json');
Expand Down

0 comments on commit 5f488b0

Please sign in to comment.