fixed naming schema and rails-rspec gem for rails 6.1 tests

Author: jonasjabari

.github/workflows/dockerpush.yml

@@ -3,43 +3,51 @@ name: specs
 on: [push]
 
 jobs:
-  test_6_1:
+  test_6_1_ruby_3_0:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker-compose run --rm test_6_1 bundle exec rake db:schema:load
-          docker-compose run --rm test_6_1 bundle exec rspec spec/test
-  test_6_0:
+          docker-compose run --rm test_6_1_ruby_3_0 bundle exec rake db:schema:load
+          docker-compose run --rm test_6_1_ruby_3_0 bundle exec rspec spec/test
+  test_6_1_ruby_2_7:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker-compose run --rm test_6_0 bundle exec rake db:schema:load
-          docker-compose run --rm test_6_0 bundle exec rspec spec/test
-  test_5_2:
+          docker-compose run --rm test_6_1_ruby_2_7 bundle exec rake db:schema:load
+          docker-compose run --rm test_6_1_ruby_2_7 bundle exec rspec spec/test
+  test_6_0_ruby_2_6:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker-compose run --rm test_5_2 bundle exec rake db:schema:load
-          docker-compose run --rm test_5_2 bundle exec rspec spec/test
-  test_5_1:
+          docker-compose run --rm test_6_0_ruby_2_6 bundle exec rake db:schema:load
+          docker-compose run --rm test_6_0_ruby_2_6 bundle exec rspec spec/test
+  test_5_2_ruby_2_6:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker-compose run --rm test_5_1 bundle exec rake db:schema:load
-          docker-compose run --rm test_5_1 bundle exec rspec spec/test
-  test_5_0:
+          docker-compose run --rm test_5_2_ruby_2_6 bundle exec rake db:schema:load
+          docker-compose run --rm test_5_2_ruby_2_6 bundle exec rspec spec/test
+  test_5_1_ruby_2_5:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker-compose run --rm test_5_0 bundle exec rake db:schema:load
-          docker-compose run --rm test_5_0 bundle exec rspec spec/test
+          docker-compose run --rm test_5_1_ruby_2_5 bundle exec rake db:schema:load
+          docker-compose run --rm test_5_1_ruby_2_5 bundle exec rspec spec/test
+  test_5_0_ruby_2_5:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run tests
+        run: |
+          docker-compose run --rm test_5_0_ruby_2_5 bundle exec rake db:schema:load
+          docker-compose run --rm test_5_0_ruby_2_5 bundle exec rspec spec/test

Dockerfile.test.5.0 renamed to Dockerfile.test_5_0_ruby_2_5

@@ -0,0 +1,44 @@
+FROM ruby:2.7-alpine3.12
+
+RUN gem install bundler:2.1.4
+
+RUN apk update --no-cache && \
+    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev && \
+    mkdir -p /app
+
+WORKDIR /app
+
+COPY ./lib/ /app/lib/
+COPY matestack-ui-core.gemspec /app/
+COPY Gemfile.6.1 /app/Gemfile
+RUN bundle install
+
+COPY package.json yarn* /app/
+RUN yarn install
+
+RUN apk update && apk upgrade \
+    && echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
+    && echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
+    && apk add --no-cache \
+    chromium@edge \
+    nss@edge \
+    && rm -rf /var/lib/apt/lists/* \
+    /var/cache/apk/* \
+    /usr/share/man \
+    /tmp/*
+
+RUN apk add chromium-chromedriver@edge
+
+ENV CHROME_BIN=/usr/bin/chromium-browser \
+    CHROME_PATH=/usr/lib/chromium/
+
+RUN mv Gemfile _Gemfile
+RUN mv Gemfile.lock _Gemfile.lock
+COPY . /app
+RUN rm Gemfile
+RUN rm Gemfile.lock
+RUN mv _Gemfile Gemfile
+RUN mv _Gemfile.lock Gemfile.lock
+
+RUN rm /app/spec/dummy/config/application.rb
+RUN mv /app/spec/dummy/config/application.6.1_rb /app/spec/dummy/config/application.rb

Dockerfile.test.5.1 renamed to Dockerfile.test_5_1_ruby_2_5

@@ -18,7 +18,7 @@ gem "cells-rails"
 gem "cells-haml"
 
 group :development, :test do
-  gem 'rspec-rails', '~> 3.8'
+  gem 'rspec-rails', '~> 4.0.2'
   gem 'capybara'
   gem 'webpacker', '~> 4.0'
   gem 'pg', '>= 0.18', '< 2.0'

Dockerfile.test.5.2 renamed to Dockerfile.test_5_2_ruby_2_6

@@ -50,54 +50,65 @@ services:
     command: "bundle exec rspec spec/test"
     user: ${CURRENT_UID}
 
-  test_5_0:
+  test_5_0_ruby_2_5:
     build:
       context: .
-      dockerfile: ./Dockerfile.test.5.2
+      dockerfile: ./Dockerfile.test_5_0_ruby_2_5
     environment:
       RAILS_ENV: test
     links:
       - postgres_test
     command: "bundle exec rspec spec/test"
     user: ${CURRENT_UID}
 
-  test_5_1:
+  test_5_1_ruby_2_5:
     build:
       context: .
-      dockerfile: ./Dockerfile.test.5.2
+      dockerfile: ./Dockerfile.test_5_1_ruby_2_5
     environment:
       RAILS_ENV: test
     links:
       - postgres_test
     command: "bundle exec rspec spec/test"
     user: ${CURRENT_UID}
 
-  test_5_2:
+  test_5_2_ruby_2_6:
     build:
       context: .
-      dockerfile: ./Dockerfile.test.5.2
+      dockerfile: ./Dockerfile.test_5_2_ruby_2_6
     environment:
       RAILS_ENV: test
     links:
       - postgres_test
     command: "bundle exec rspec spec/test"
     user: ${CURRENT_UID}
 
-  test_6_0:
+  test_6_0_ruby_2_6:
     build:
       context: .
-      dockerfile: ./Dockerfile.test.6.0
+      dockerfile: ./Dockerfile.test_6_0_ruby_2_6
     environment:
       RAILS_ENV: test
     links:
       - postgres_test
     command: "bundle exec rspec spec/test"
     user: ${CURRENT_UID}
 
-  test_6_1:
+  test_6_1_ruby_2_7:
     build:
       context: .
-      dockerfile: ./Dockerfile.test.6.1
+      dockerfile: ./Dockerfile.test_6_1_ruby_2_7
+    environment:
+      RAILS_ENV: test
+    links:
+      - postgres_test
+    command: "bundle exec rspec spec/test"
+    user: ${CURRENT_UID}
+
+  test_6_1_ruby_3_0:
+    build:
+      context: .
+      dockerfile: ./Dockerfile.test_6_1_ruby_3_0
     environment:
       RAILS_ENV: test
     links: