From 62a49a00724ddeba9a2591609c9412996140f856 Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Wed, 25 Mar 2020 00:48:50 +0200 Subject: [PATCH] Fix circle --- .circleci/config.yml | 4 ++-- .env.test | 2 +- docker-compose.dev.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4c06819..c98653e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,13 +102,13 @@ jobs: name: Database setup command: bundle exec rails db:schema:load --trace # Run rspec in parallel + # ./cc-test-reporter before-build + # ./cc-test-reporter after-build --coverage-input-type clover --exit-code $? - run: command: | mkdir /tmp/test-results -# ./cc-test-reporter before-build TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings) bundle exec rspec $TESTFILES --profile 10 -r rspec_junit_formatter --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress -# ./cc-test-reporter after-build --coverage-input-type clover --exit-code $? - store_test_results: path: /tmp/test-results - store_artifacts: diff --git a/.env.test b/.env.test index c288f35..df76ffc 100644 --- a/.env.test +++ b/.env.test @@ -17,7 +17,7 @@ SELENIUM_HOST=selenium TEST_APP_HOST=localhost TEST_APP_PORT=3005 -MYSQL_HOST=localhost +MYSQL_HOST=db MYSQL_DATABASE=ensl_test MYSQL_USER=ensl MYSQL_USERNAME=ensl diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 1b2cc7a..c5cd782 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -6,7 +6,7 @@ services: tty: true stdin_open: true # Debug - # command: /bin/bash + command: /bin/bash container_name: ensl_dev build: context: ./