From 57ab17102b99b0680b0c560ac3bbd3dad7d46f07 Mon Sep 17 00:00:00 2001
From: Deepak Mahakale <deepakmahakale@gmail.com>
Date: Tue, 2 Aug 2022 10:53:53 +0530
Subject: [PATCH 1/2] FIXES #287 - Add GitHub CI - Add more versions to matrix
 - Exclude incompatible versions - Fix rails 7 later

---
 .github/workflows/ci.yml                      | 53 +++++++++++++++++++
 .travis.yml                                   | 17 ------
 gemfiles/rails_5.2.gemfile                    |  2 +-
 .../{rails_5.1.gemfile => rails_6.0.gemfile}  |  2 +-
 ...{rails_6.0.1.gemfile => rails_7.0.gemfile} |  2 +-
 5 files changed, 56 insertions(+), 20 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml
 rename gemfiles/{rails_5.1.gemfile => rails_6.0.gemfile} (91%)
 rename gemfiles/{rails_6.0.1.gemfile => rails_7.0.gemfile} (91%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..19a0564
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,53 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          # - 'head'
+        gemfile:
+          - gemfiles/rails_5.2.gemfile
+          - gemfiles/rails_6.0.gemfile
+          # - gemfiles/rails_7.0.gemfile
+          # - gemfile: gemfiles/rails_head.gemfile
+        exclude:
+          # - ruby: '2.5'
+          #   gemfile: gemfiles/rails_7.0.gemfile
+          # - ruby: '2.6'
+          #   gemfile: gemfiles/rails_7.0.gemfile
+          - ruby: '2.7'
+            gemfile: gemfiles/rails_5.2.gemfile
+          - ruby: '3.0'
+            gemfile: gemfiles/rails_5.2.gemfile
+          - ruby: '3.0'
+            gemfile: gemfiles/rails_6.0.gemfile
+          - ruby: '3.1'
+            gemfile: gemfiles/rails_5.2.gemfile
+          - ruby: '3.1'
+            gemfile: gemfiles/rails_6.0.gemfile
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run test
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+        run: bundle exec rake test
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 123ee7c..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-language: ruby
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-
-sudo: false
-
-gemfile:
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.1.gemfile
-
-jobs:
-  exclude:
-  - gemfile: gemfiles/rails_5.1.gemfile
-    rvm: 2.7.1
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
index 56b28a7..45509cf 100644
--- a/gemfiles/rails_5.2.gemfile
+++ b/gemfiles/rails_5.2.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2"
+gem "rails", "~> 5.2.0"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_6.0.gemfile
similarity index 91%
rename from gemfiles/rails_5.1.gemfile
rename to gemfiles/rails_6.0.gemfile
index 56b28a7..9bc2721 100644
--- a/gemfiles/rails_5.1.gemfile
+++ b/gemfiles/rails_6.0.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2"
+gem "rails", "~> 6.0"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]
diff --git a/gemfiles/rails_6.0.1.gemfile b/gemfiles/rails_7.0.gemfile
similarity index 91%
rename from gemfiles/rails_6.0.1.gemfile
rename to gemfiles/rails_7.0.gemfile
index 7b97936..d3c9e35 100644
--- a/gemfiles/rails_6.0.1.gemfile
+++ b/gemfiles/rails_7.0.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.1"
+gem "rails", "~> 7.0"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]

From da98a49bb3ed24b3eba2cb798eb54e2db4488cd4 Mon Sep 17 00:00:00 2001
From: Deepak Mahakale <deepakmahakale@gmail.com>
Date: Tue, 2 Aug 2022 11:02:52 +0530
Subject: [PATCH 2/2] Fix the breaking test cases by replacing attr_reader with
 attr_accessor

---
 lib/wicked/wizard.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/wicked/wizard.rb b/lib/wicked/wizard.rb
index f147f8a..309b0a3 100644
--- a/lib/wicked/wizard.rb
+++ b/lib/wicked/wizard.rb
@@ -3,7 +3,7 @@ module Wizard
     extend ActiveSupport::Concern
 
     class InvalidStepError < RuntimeError
-      attr_reader :step
+      attr_accessor :step
 
       def initialize(step = nil)
         self.step = step