Skip to content

Commit 75d54be

Browse files
committed
cleanup specs, removed 0.7 specs, restructured specs, use postgres for test and dummy
1 parent a72e85a commit 75d54be

File tree

296 files changed

+412
-15105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+412
-15105
lines changed

.github/workflows/dockerpush.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
- name: Run tests
1313
run: |
1414
docker-compose run --rm test bundle exec rake db:schema:load
15-
docker-compose run --rm test bundle exec rspec spec/usage spec/lib
15+
docker-compose run --rm test bundle exec rspec spec/test

Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ruby:2.6.5-alpine3.9
33
RUN gem install bundler:2.1.4
44

55
RUN apk update --no-cache && \
6-
apk add build-base git nodejs yarn tzdata bash sqlite-dev && \
6+
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev && \
77
mkdir -p /app
88

99
WORKDIR /app

Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ruby:2.6.5-alpine3.9
33
RUN gem install bundler:2.1.4
44

55
RUN apk update --no-cache && \
6-
apk add build-base git nodejs yarn tzdata bash sqlite-dev && \
6+
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev && \
77
mkdir -p /app
88

99
WORKDIR /app

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ group :development, :test do
1919
gem 'rspec-rails', '~> 3.8'
2020
gem 'capybara'
2121
gem 'webpacker', '~> 4.0'
22-
gem 'sqlite3', '~> 1.4'
22+
gem 'pg', '>= 0.18', '< 2.0'
2323
gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
2424
gem 'puma'
2525
gem 'simplecov', require: false, group: :test

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ GEM
127127
nio4r (2.5.2)
128128
nokogiri (1.10.10)
129129
mini_portile2 (~> 2.4.0)
130+
pg (1.2.3)
130131
pry (0.12.2)
131132
coderay (~> 1.1.0)
132133
method_source (~> 0.9.0)
@@ -212,7 +213,6 @@ GEM
212213
actionpack (>= 4.0)
213214
activesupport (>= 4.0)
214215
sprockets (>= 3.0.0)
215-
sqlite3 (1.4.2)
216216
temple (0.8.2)
217217
thor (1.0.1)
218218
thread_safe (0.3.6)
@@ -250,6 +250,7 @@ DEPENDENCIES
250250
cells-rails
251251
generator_spec
252252
matestack-ui-core!
253+
pg (>= 0.18, < 2.0)
253254
pry-byebug
254255
pry-rails
255256
puma
@@ -258,7 +259,6 @@ DEPENDENCIES
258259
rspec-wait (~> 0.0.9)
259260
selenium-webdriver (~> 3.142, >= 3.142.7)
260261
simplecov
261-
sqlite3 (~> 1.4)
262262
trailblazer-cells
263263
turbolinks
264264
webmock

docker-compose.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ services:
3737
dockerfile: ./Dockerfile.test
3838
environment:
3939
RAILS_ENV: test
40+
links:
41+
- postgres_test
4042
ports:
4143
- "33123:33123"
4244
volumes:
@@ -46,7 +48,18 @@ services:
4648
command: "bundle exec rspec spec/usage/components"
4749
user: ${CURRENT_UID}
4850

51+
postgres_test:
52+
image: postgres
53+
expose:
54+
- 5432
55+
environment:
56+
POSTGRES_USER: postgres
57+
POSTGRES_PASSWORD: postgres
58+
POSTGRES_DB: test
59+
volumes:
60+
- test-data-volume:/var/lib/postgresql/data
61+
4962
volumes:
50-
data-volume:
63+
test-data-volume:
5164
gem-volume:
5265
node-volume:

spec/0.7/base/app_spec.rb

Lines changed: 0 additions & 220 deletions
This file was deleted.

0 commit comments

Comments
 (0)