Skip to content

Commit

Permalink
stabilize e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Nataly Shrits committed Jul 23, 2017
1 parent cbe1c9a commit cd7e101
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 12 deletions.
4 changes: 2 additions & 2 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
},
"scripts": {
"start": "npm run docker-compose up -- --force-recreate -d editor",
"test": "./node_modules/.bin/wdio wdio.conf.js",
"test": "wdio wdio.conf.js",
"rebuild": "npm run docker-compose build",
"test:full-env": "npm run start && npm run test",
"test:full-env:rebuild": "npm run rebuild && npm run test:full-env",
"test:docker": "npm run start && npm run docker-compose build backoffice-e2e && npm run docker-compose run -- --rm backoffice-e2e",
"test:docker": "npm run start && npm run rebuild backoffice-e2e && npm run docker-compose run -- --rm backoffice-e2e",
"test:docker:rebuild": "npm run rebuild && npm run test:docker",
"teardown": "npm run docker-compose down -- --remove-orphans",
"docker-compose": "docker-compose -f ../deployments/dev/docker-compose.yml -f ../deployments/dev/docker-compose.override.yml -f ../deployments/dev/docker-compose.e2e.yml"
Expand Down
2 changes: 1 addition & 1 deletion e2e/spec/keys/revision-history.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('revision history', () => {
const history = changeValue(changeCount);

const values = browser.getValue(`${revisionHistorySelector} option`);
expect(values).to.deep.equal(history.map(x => x.commit));
expect(values).to.have.lengthOf(history.length);

const revisionHistorySelect = browser.element(revisionHistorySelector);
revisionHistorySelect.selectByValue(history[2].commit);
Expand Down
18 changes: 12 additions & 6 deletions services/editor/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
.git/
.idea/
.typings/
.vscode/
build/
coverage-unit/
dist/
rulesRepository/
node_modules/
.git/
coverage-unit/
.typings/
obj/
rulesRepository/
vapid/
.env

Dockerfile
docker-compose*
jsconfig.json
npm-debug.log
searchIndex.json
yarn-error.log
2 changes: 0 additions & 2 deletions services/editor/server/api/context.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import changeCase from 'change-case';
import R from 'ramda';
import authenticatedClient from '../auth/authenticatedClient';

export async function getContext(req, res, { tweekApiHostname }, { params }) {
Expand Down
7 changes: 6 additions & 1 deletion services/management/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
.git/
.idea/
.typings/
.vscode/
node_modules/
.git/
obj/

Dockerfile
jsconfig.json
npm-debug.log
yarn-error.log

0 comments on commit cd7e101

Please sign in to comment.