Merge pull request #21 from blocknotes/support-for-ruby-3.0

Update GitHub actions for Ruby 3.0

Author: Mattia Roccoberton

.github/workflows/specs.yml

@@ -1,5 +1,5 @@
 ---
-name: Specs
+name: Specs Rails 6.0
 
 on:
   pull_request:
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.6', '2.7']
-        gemfile: ['rails60_activeadmin22', 'rails60_activeadmin', 'rails61_activeadmin29', 'rails61_activeadmin']
+        gemfile: ['rails60_activeadmin22', 'rails60_activeadmin']
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

.github/workflows/specs2.yml

@@ -0,0 +1,40 @@
+---
+name: Specs Rails 6.1
+
+on:
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0']
+        gemfile: ['rails61_activeadmin29', 'rails61_activeadmin']
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec --profile
+
+      - name: On failure, archive screenshots as artifacts
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: test-failed-screenshots
+          path: spec/dummy/tmp/screenshots

spec/system/dynamic_fields_spec.rb

@@ -53,16 +53,16 @@ def test_unset_css(target, options = {})
     expect(page).to have_css(target)
   end
 
-  def test_change_css(target, attrs1, attrs2, options = {})
+  def test_change_css(target, options = {})
     spec_message("test change CSS on #{target} ...")
 
-    expect(page).to have_css(target, attrs1)
+    expect(page).to have_css(target, **options[:attrs1])
     block_given? ? yield : apply_action(options[:action])
-    expect(page).to have_css(target, attrs2)
+    expect(page).to have_css(target, **options[:attrs2])
     return if options[:one_way]
 
     block_given? ? yield : apply_action(options[:action], inverse: true)
-    expect(page).to have_css(target, attrs1)
+    expect(page).to have_css(target, **options[:attrs1])
   end
 
   context 'with some dynamic fields' do
@@ -132,17 +132,17 @@ def test_change_css(target, attrs1, attrs2, options = {})
       # --- hide
       spec_message('check data-then="hide" action')
       target = '#post_data_field_241_input .inline-hints'
-      test_change_css(target, { visible: :visible }, { visible: :hidden }, action: [:click, '#post_data_field_241'])
+      test_change_css(target, { attrs1: { visible: :visible }, attrs2: { visible: :hidden }, action: [:click, '#post_data_field_241'] })
 
       # --- fade
       spec_message('check data-then="fade" action')
       target = '#post_data_field_251_input .inline-hints'
-      test_change_css(target, { visible: :visible }, { visible: :hidden }, action: [:click, '#post_data_field_251'])
+      test_change_css(target, { attrs1: { visible: :visible }, attrs2: { visible: :hidden }, action: [:click, '#post_data_field_251'] })
 
       # --- slide
       spec_message('check data-then="slide" action')
       target = '#post_data_field_261_input .inline-hints'
-      test_change_css(target, { visible: :visible }, { visible: :hidden }, action: [:click, '#post_data_field_261'])
+      test_change_css(target, { attrs1: { visible: :visible }, attrs2: { visible: :hidden }, action: [:click, '#post_data_field_261'] })
 
       # --- setText
       spec_message('check data-then="setText ..." action')
@@ -154,7 +154,7 @@ def test_change_css(target, attrs1, attrs2, options = {})
       spec_message('check data-then="addStyle ..." action')
       style1 = { style: { 'margin-right': '20px' } }
       style2 = { style: 'margin-right: 20px; font-size: 10px; padding: 3px' }
-      test_change_css('#post_data_field_281', style1, style2, action: [:click, '#post_data_field_281'])
+      test_change_css('#post_data_field_281', { attrs1: style1, attrs2: style2, action: [:click, '#post_data_field_281'] })
 
       # --- gtarget
       spec_message('check data-gtarget="..."')