Merge pull request #10 from blocknotes/minor-internal-changes

Mattia Roccoberton · web-flow · commit fadea58db759 · 2022-03-06T12:20:26.000+01:00
Set minimum Ruby version to 2.6 + minor internal changes
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -18,27 +18,9 @@ AllCops:
     - vendor/**/*
   NewCops: enable
 
-Gemspec/RequiredRubyVersion:
-  Enabled: false
-
-Naming/FileName:
-  Enabled: false
-
-Layout/LineLength:
-  Enabled: true
-  Max: 120
+Style/OpenStructUse:
+  Enabled: false # TODO: fix me
 
 RSpec/ExampleLength:
-  Max: 8
-
-RSpec/MultipleExpectations:
-  Max: 5
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
+  # default 5
+  Max: 10
diff --git a/activeadmin_active_resource.gemspec b/activeadmin_active_resource.gemspec
@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.files         = Dir['{lib}/**/*', 'LICENSE.txt', 'Rakefile', 'README.md']
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.6.0'
+
   spec.add_runtime_dependency 'activeadmin', '~> 2.0'
   spec.add_runtime_dependency 'activeresource', '>= 5.1'
 
diff --git a/extra/.env b/extra/.env
@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=activeadmin_active_resource
diff --git a/extra/Dockerfile_26 b/extra/Dockerfile_26
@@ -0,0 +1,8 @@
+FROM ruby:2.6-alpine
+
+RUN apk add --no-cache --update build-base dpkg gcompat sqlite sqlite-dev tzdata
+RUN gem install bundler
+
+# App setup
+WORKDIR /usr/src/app
+COPY .. .
diff --git a/extra/Dockerfile_27 b/extra/Dockerfile_27
@@ -0,0 +1,7 @@
+FROM ruby:2.7-alpine
+
+RUN apk add --no-cache --update build-base dpkg gcompat sqlite sqlite-dev tzdata
+
+# App setup
+WORKDIR /usr/src/app
+COPY .. .
diff --git a/extra/Dockerfile_30 b/extra/Dockerfile_30
@@ -0,0 +1,7 @@
+FROM ruby:3.0-alpine
+
+RUN apk add --no-cache --update build-base dpkg gcompat sqlite sqlite-dev tzdata
+
+# App setup
+WORKDIR /usr/src/app
+COPY .. .
diff --git a/extra/docker-compose.yml b/extra/docker-compose.yml
@@ -0,0 +1,37 @@
+---
+version: "3.3"
+
+x-defaults:
+  test_app: &test_app
+    command:
+      - |
+        bundle install --gemfile=gemfiles/rails$${RAILS}_activeadmin_activeresource.gemfile
+        bin/appraisal rails$${RAILS}-activeadmin-activeresource rspec
+    entrypoint: ["/bin/sh", "-c"]
+    volumes:
+      - ..:/usr/src/app:delegated
+
+services:
+  tests_26:
+    <<: *test_app
+    build:
+      context: ..
+      dockerfile: extra/Dockerfile_26
+    environment:
+      RAILS: 61
+
+  tests_27:
+    <<: *test_app
+    build:
+      context: ..
+      dockerfile: extra/Dockerfile_27
+    environment:
+      RAILS: 61
+
+  tests_30:
+    <<: *test_app
+    build:
+      context: ..
+      dockerfile: extra/Dockerfile_30
+    environment:
+      RAILS: 61
diff --git a/gemfiles/rails61_activeadmin_activeresource.gemfile.lock b/gemfiles/rails61_activeadmin_activeresource.gemfile.lock
@@ -158,8 +158,14 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     nio4r (2.5.8)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    nokogiri (1.13.3-aarch64-linux)
+      racc (~> 1.4)
     nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.3-x86_64-linux)
@@ -294,6 +300,8 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  aarch64-linux
+  ruby
   x86_64-darwin-21
   x86_64-linux
 
@@ -321,4 +329,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.33
+   2.3.8
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -5,7 +5,7 @@
   config.filter_run focus: true
   config.filter_run_excluding changes_filesystem: true
   config.run_all_when_everything_filtered = true
-  config.color = true
+
   config.order = :random
   config.example_status_persistence_file_path = '.rspec_failures'
   config.shared_context_metadata_behavior = :apply_to_host_groups
diff --git a/spec/support/output.rb b/spec/support/output.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.color = true
+  config.tty = true
+end
diff --git a/spec/system/authors_spec.rb b/spec/system/authors_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe 'Authors', type: :system do
-  it 'fails to create an author', :vcr do
+  it 'fails to create an author', :aggregate_failures, :vcr do
     visit '/admin/authors/new'
 
     fill_in('author[name]', with: 'Boh')
@@ -13,7 +13,7 @@
     expect(error).to include 'Invalid email'
   end
 
-  it 'creates an author', :vcr do
+  it 'creates an author', :aggregate_failures, :vcr do
     visit '/admin/authors/new'
 
     fill_in('author[name]', with: 'Some name')
@@ -26,21 +26,21 @@
   end
 
   context 'with some authors' do
-    it 'loads the authors list', :vcr do
+    it 'loads the authors list', :aggregate_failures, :vcr do
       visit '/admin/authors'
 
       expect(page).to have_http_status(:success)
       expect(page).to have_css('#index_table_authors td.col-name', count: 4)
     end
 
-    it 'loads an author', :vcr do
+    it 'loads an author', :aggregate_failures, :vcr do
       visit '/admin/authors/1'
 
       expect(page).to have_http_status(:success)
       expect(page).to have_css('#attributes_table_author_1')
     end
 
-    it 'fails to update an author', :vcr do
+    it 'fails to update an author', :aggregate_failures, :vcr do
       visit '/admin/authors/1/edit'
 
       fill_in('author[name]', with: '')
@@ -51,7 +51,7 @@
       expect(error).to include "is too short"
     end
 
-    it 'updates an author', :vcr do
+    it 'updates an author', :aggregate_failures, :vcr do
       visit '/admin/authors/1/edit'
 
       fill_in('author[age]', with: '30')
@@ -61,7 +61,7 @@
       expect(page).to have_content('Author was successfully updated.')
     end
 
-    it 'destroys an author', :vcr do
+    it 'destroys an author', :aggregate_failures, :vcr do
       visit '/admin/authors'
 
       find_all('.delete_link.member_link').last.click
diff --git a/spec/system/posts_spec.rb b/spec/system/posts_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe 'Posts', type: :system do
-  it 'fails to create a post', :vcr do
+  it 'fails to create a post', :aggregate_failures, :vcr do
     visit '/admin/posts/new'
 
     fill_in('post[title]', with: '')
@@ -13,7 +13,7 @@
   end
 
   context 'with some authors' do
-    it 'creates a post', :vcr do
+    it 'creates a post', :aggregate_failures, :vcr do
       visit '/admin/posts/new'
 
       fill_in('post[title]', with: 'Some title')
@@ -26,21 +26,21 @@
   end
 
   context 'with some posts' do
-    it 'loads the posts list', :vcr do
+    it 'loads the posts list', :aggregate_failures, :vcr do
       visit '/admin/posts'
 
       expect(page).to have_http_status(:success)
       expect(page).to have_css('#index_table_posts td.col-title', count: 3)
     end
 
-    it 'loads a post', :vcr do
+    it 'loads a post', :aggregate_failures, :vcr do
       visit '/admin/posts/1'
 
       expect(page).to have_http_status(:success)
       expect(page).to have_css('#attributes_table_post_1')
     end
 
-    it 'fails to update a post', :vcr do
+    it 'fails to update a post', :aggregate_failures, :vcr do
       visit '/admin/posts/1/edit'
 
       fill_in('post[title]', with: '')
@@ -51,7 +51,7 @@
       expect(error).to include "is too short"
     end
 
-    it 'updates a post', :vcr do
+    it 'updates a post', :aggregate_failures, :vcr do
       visit '/admin/posts/1/edit'
 
       fill_in('post[description]', with: 'Some desc')
@@ -61,7 +61,7 @@
       expect(page).to have_content('Post was successfully updated.')
     end
 
-    it 'destroys a post', :vcr do
+    it 'destroys a post', :aggregate_failures, :vcr do
       visit '/admin/posts'
 
       find_all('.delete_link.member_link').last.click
diff --git a/spec/system/tags_spec.rb b/spec/system/tags_spec.rb
@@ -2,14 +2,14 @@
 
 RSpec.describe 'Tags', type: :system do
   context 'with some tags' do
-    it 'loads the tags list', :vcr do
+    it 'loads the tags list', :aggregate_failures, :vcr do
       visit '/admin/tags'
 
       expect(page).to have_http_status(:success)
       expect(page).to have_css('#index_table_tags td.col-name', count: 5)
     end
 
-    it 'filters the tags', :vcr do
+    it 'filters the tags', :aggregate_failures, :vcr do
       visit '/admin/tags'
 
       fill_in('q[name_cont]', with: 'Some tag')
@@ -19,7 +19,7 @@
       expect(name.text).to eq 'Some tag'
     end
 
-    it 'loads a tag', :vcr do
+    it 'loads a tag', :aggregate_failures, :vcr do
       visit '/admin/tags/1'
 
       expect(page).to have_http_status(:success)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+COMPOSE_PROJECT_NAME=activeadmin_active_resource`