Skip to content

Commit

Permalink
cleaned up integration test flow
Browse files Browse the repository at this point in the history
  • Loading branch information
dannycoates committed Oct 4, 2018
1 parent 23d629b commit 76de2b2
Show file tree
Hide file tree
Showing 20 changed files with 295 additions and 1,970 deletions.
9 changes: 0 additions & 9 deletions .babelrc

This file was deleted.

2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ dist
assets
firefox
coverage
test/integration
test/wdio.*
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ ios/send-ios/assets/ios.js
ios/send-ios/assets/vendor.js
ios/send-ios.xcodeproj/project.xcworkspace/xcuserdata/*
ios/send-ios.xcodeproj/xcuserdata/*
test/integration/downloads
55 changes: 22 additions & 33 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,58 +6,47 @@ jobs:
steps:
- checkout
- restore_cache:
key: send-{{ checksum "package-lock.json" }}
key: send-build-{{ checksum "package-lock.json" }}
- run: npm install
- save_cache:
key: send-{{ checksum "package-lock.json" }}
key: send-build-{{ checksum "package-lock.json" }}
paths:
- node_modules
- run: npm run build
- persist_to_workspace:
root: .
paths:
- ./*
- ./dist
test:
docker:
- image: circleci/node:10-browsers
steps:
- checkout
- restore_cache:
key: send-{{ checksum "package-lock.json" }}
key: send-test-{{ checksum "package-lock.json" }}
- run: npm install
- save_cache:
key: send-{{ checksum "package-lock.json" }}
key: send-test-{{ checksum "package-lock.json" }}
paths:
- node_modules
- run: npm run lint
- run: npm run test
- store_artifacts:
path: coverage
integration_tests:
machine: true
docker:
- image: circleci/node:10
- image: selenium/standalone-firefox
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Install Docker Compose
command: |
set -x
pip install docker-compose>=1.18
docker-compose --version
- run:
name: Setup
command: |
set -x
docker-compose pull
- run:
name: Run Integration tests
command: |
set -x
docker-compose up -d selenium-firefox
sleep 10
docker-compose ps
docker-compose exec selenium-firefox npm run test-circle:selenium
- restore_cache:
key: send-int-{{ checksum "package-lock.json" }}
- run: npm install
- save_cache:
key: send-int-{{ checksum "package-lock.json" }}
paths:
- node_modules
- run: npm run circleci-test-integration
deploy_dev:
machine: true
steps:
Expand Down Expand Up @@ -101,12 +90,12 @@ workflows:
ignore:
- master
- vnext
# - integration_tests:
# filters:
# branches:
# ignore: master
# requires:
# - build
- integration_tests:
filters:
branches:
ignore: master
requires:
- build
build_and_deploy_dev:
jobs:
- build:
Expand Down
Loading

0 comments on commit 76de2b2

Please sign in to comment.