Skip to content

Commit 55078dd

Browse files
committed
wait for start
1 parent 40c3f0e commit 55078dd

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

.circleci/compose-unit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3.7'
21
services:
32
# Unit server
43
rails-unit:

.circleci/compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3.7'
21
services:
32
# Rails database
43
# If you wish to clear the database contents simply run

.github/workflows/test-unit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- uses: actions/checkout@v2
99
- name: Build and run tests
1010
run: |
11-
docker-compose -f .circleci/compose-unit.yml up -d
11+
docker-compose -f .circleci/compose-unit.yml up -d --wait
1212
timeout 60 bash -c -- 'while [[ "$(docker-compose -f .circleci/compose-unit.yml exec -T rails-unit curl -s -o /dev/null -w ''%{http_code}'' http://localhost:3000/api/v1/health)" != "200" ]]; do sleep 1; printf "."; done'
1313
docker-compose -f .circleci/compose-unit.yml exec -T rails-unit bundle exec rails db:test:prepare
1414
docker-compose -f .circleci/compose-unit.yml exec -T rails-unit bundle exec rspec --format progress

spec/rails_helper.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
# Remember to include global test helpers here
3838
include ConcernHelper
3939

40-
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
41-
config.fixture_path = "#{::Rails.root}/spec/fixtures"
40+
config.fixture_paths = ["#{::Rails.root}/spec/fixtures"]
4241

4342
DatabaseCleaner.allow_remote_database_url = true
4443
config.use_transactional_fixtures = false

0 commit comments

Comments
 (0)