Skip to content

Commit

Permalink
Separate container-building from ruby code
Browse files Browse the repository at this point in the history
Writing documentation on the acceptance tests made me realize that there
were two unrelated responsibilities under features/support, so I moved
all the docker-related files into a new directory.
  • Loading branch information
daaang committed Nov 25, 2021
1 parent 5444e70 commit a53f7f6
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dc = docker-compose --file features/support/docker-compose.yml --project-directory .
dc = docker-compose --file features/test-runner/docker-compose.yml --project-directory .
.PHONY: all clean test features serve docsite containers teardown

# Default action is running all unit and acceptance tests
Expand Down
3 changes: 3 additions & 0 deletions features/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ In case you the reader are unfamiliar with [cucumber][1], these files
are also runnable tests, with definitions in the `steps/` directory and
additional support code in `support/`.

Everything needed to set up the environment that actually runs the tests
is in `test-runner/`.

[1]: https://cucumber.io
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN useradd -d /tmp tester \
#
# docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app ruby:3.0 bundle install
WORKDIR /usr/src/app
COPY support/Gemfile support/Gemfile.lock ./
COPY test-runner/Gemfile test-runner/Gemfile.lock ./
RUN bundle install

# After building dependencies, then copy in the code (which is much more
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
features:
build:
context: ./features
dockerfile: support/Dockerfile
dockerfile: test-runner/Dockerfile
networks:
- frontend
depends_on:
Expand Down

0 comments on commit a53f7f6

Please sign in to comment.