Upgrade ruby to 3.0 minimum (#58)

uchagani · web-flow · commit f3ecd5059c4f · 2025-04-13T17:15:12.000-04:00
* Upgrade ruby to min version 3.0.  Upgrade gems

* choose safer version constraints

* explictly list ruby 3.0.7

* use strings to specify ruby versions

* update actions to fix tests

* update actions to fix tests

* remove support for activesupport 7.0.x
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -6,52 +6,32 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.5.9, 2.6.10, 2.7.8, jruby-9.3]
+        os: [ubuntu-latest, macos-latest]
+        ruby: ['3.0', 3.1, 3.2, 3.3, head, jruby-9.4, jruby-head]
         gemfile:
-          - Gemfile.activesupport-4.0
-          - Gemfile.activesupport-4.1
-          - Gemfile.activesupport-4.2
-          - Gemfile.activesupport-5.0
-          - Gemfile.activesupport-5.1
+          - Gemfile.activesupport-7.1
+          - Gemfile.activesupport-7.2
+          - Gemfile.activesupport-8.0
         exclude:
-          - ruby: jruby-9.3
-            gemfile: Gemfile.activesupport-4.0
-          - ruby: jruby-9.3
-            gemfile: Gemfile.activesupport-4.1
-          - ruby: jruby-9.3
-            gemfile: Gemfile.activesupport-5.0
-          - ruby: jruby-9.3
-            gemfile: Gemfile.activesupport-5.1
-          - ruby: 2.5.9
-            gemfile: Gemfile.activesupport-4.0
-          - ruby: 2.5.9
-            gemfile: Gemfile.activesupport-4.1
-          - ruby: 2.5.9
-            gemfile: Gemfile.activesupport-4.2
-          - ruby: 2.6.10
-            gemfile: Gemfile.activesupport-4.0
-          - ruby: 2.6.10
-            gemfile: Gemfile.activesupport-4.1
-          - ruby: 2.6.10
-            gemfile: Gemfile.activesupport-4.2
-          - ruby: 2.7.8
-            gemfile: Gemfile.activesupport-4.0
-          - ruby: 2.7.8
-            gemfile: Gemfile.activesupport-4.1
-          - ruby: 2.7.8
-            gemfile: Gemfile.activesupport-4.2
-
+          - ruby: '3.0'
+            gemfile: Gemfile.activesupport-8.0
+          - ruby: '3.0'
+            gemfile: Gemfile.activesupport-7.2
+          - ruby: 3.1
+            gemfile: Gemfile.activesupport-8.0
+          - ruby: jruby-9.4
+            gemfile: Gemfile.activesupport-8.0
+    runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.continue-on-error || false }}
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
diff --git a/Gemfile.activesupport-5.0 b/Gemfile.activesupport-5.0
diff --git a/Gemfile.activesupport-5.1 b/Gemfile.activesupport-5.1
diff --git a/Gemfile.activesupport-7.1 b/Gemfile.activesupport-7.1
@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'activesupport', '~> 4.0.2'
+gem 'activesupport', '~> 7.1.0'
diff --git a/Gemfile.activesupport-7.2 b/Gemfile.activesupport-7.2
@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'activesupport', '~> 4.1.0'
+gem 'activesupport', '~> 7.2.0'
diff --git a/Gemfile.activesupport-8.0 b/Gemfile.activesupport-8.0
@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'activesupport', '~> 4.2.0'
+gem 'activesupport', '~> 8.0.0'
diff --git a/lib/taza/generators/project_generator.rb b/lib/taza/generators/project_generator.rb
@@ -15,16 +15,16 @@ def self.source_root
 
     desc "This creates the Taza project structure. Example taza create foo"
     def create
-      template('templates/project/Gemfile.tt', 'Gemfile') unless File.exists? 'Gemfile'
-      template('templates/project/Rakefile.tt', 'Rakefile') unless File.exists? 'Rakefile'
-      template('templates/project/config.yml.tt', 'config/config.yml') unless File.exists? 'config/config.yml'
+      template('templates/project/Gemfile.tt', 'Gemfile') unless File.exist? 'Gemfile'
+      template('templates/project/Rakefile.tt', 'Rakefile') unless File.exist? 'Rakefile'
+      template('templates/project/config.yml.tt', 'config/config.yml') unless File.exist? 'config/config.yml'
       empty_directory 'lib/sites'
       empty_directory 'spec'
-      template('templates/project/spec_helper.rb.tt', 'spec/spec_helper.rb') unless File.exists? 'spec/spec_helper.rb'
+      template('templates/project/spec_helper.rb.tt', 'spec/spec_helper.rb') unless File.exist? 'spec/spec_helper.rb'
       empty_directory 'spec/isolation'
       empty_directory 'spec/integration'
       empty_directory 'bin'
-      template('templates/project/taza.tt', 'bin/taza') unless File.exists? 'bin/taza'
+      template('templates/project/taza.tt', 'bin/taza') unless File.exist? 'bin/taza'
     end
   end
 end
diff --git a/lib/taza/version.rb b/lib/taza/version.rb
@@ -1,3 +1,3 @@
 module Taza
-  VERSION = "3.0.0"
+  VERSION = "4.0.0"
 end
diff --git a/spec/generators/flow_generator_spec.rb b/spec/generators/flow_generator_spec.rb
@@ -14,7 +14,7 @@
 
       it 'a checkout.rb' do
         expect(output).to include('lib/sites/foo_site/flows/checkout.rb')
-        expect(File.exists?('lib/sites/foo_site/flows/checkout.rb')).to be true
+        expect(File.exist?('lib/sites/foo_site/flows/checkout.rb')).to be true
       end
 
       it 'a message if site does not exist' do
diff --git a/spec/generators/page_generator_spec.rb b/spec/generators/page_generator_spec.rb
@@ -15,11 +15,11 @@
 
       it 'creates a checkout_page.rb' do
         expect(output).to include('lib/sites/foo_site/pages/home_page.rb')
-        expect(File.exists?('lib/sites/foo_site/pages/home_page.rb')).to be true
+        expect(File.exist?('lib/sites/foo_site/pages/home_page.rb')).to be true
       end
       it 'creates a checkout_page_spec.rb' do
         expect(output).to include('spec/isolation/home_page_spec.rb')
-        expect(File.exists?('spec/isolation/home_page_spec.rb')).to be true
+        expect(File.exist?('spec/isolation/home_page_spec.rb')).to be true
       end
 
       it 'gives message if site does not exist' do
diff --git a/spec/generators/partial_generator_spec.rb b/spec/generators/partial_generator_spec.rb
@@ -14,7 +14,7 @@
 
       it 'a navigation.rb' do
         expect(output).to include('lib/sites/foo_site/pages/partials/navigation.rb')
-        expect(File.exists?('lib/sites/foo_site/pages/partials/navigation.rb')).to be true
+        expect(File.exist?('lib/sites/foo_site/pages/partials/navigation.rb')).to be true
       end
 
       it 'message if site does not exist' do
diff --git a/spec/generators/project_generator_spec.rb b/spec/generators/project_generator_spec.rb
@@ -9,12 +9,12 @@
 
       it 'a Gemfile' do
         expect(output).to include("Gemfile")
-        expect(File.exists?('Gemfile')).to be true
+        expect(File.exist?('Gemfile')).to be true
       end
 
       it 'a Rakefile' do
         expect(output).to include('Rakefile')
-        expect(File.exists?('Rakefile')).to be true
+        expect(File.exist?('Rakefile')).to be true
       end
 
       it 'the Rakefile can be required' do
@@ -24,7 +24,7 @@
 
       it 'config/config.yml' do
         expect(output).to include('config/config.yml')
-        expect(File.exists?('config/config.yml')).to be true
+        expect(File.exist?('config/config.yml')).to be true
       end
 
       it 'lib/sites' do
@@ -34,7 +34,7 @@
 
       it 'a spec_helper.rb' do
         expect(output).to include('spec/spec_helper.rb')
-        expect(File.exists?('spec/spec_helper.rb')).to be true
+        expect(File.exist?('spec/spec_helper.rb')).to be true
       end
 
       it 'spec_helper.rb can be required' do
@@ -59,17 +59,17 @@
 
       it 'the taza executable' do
         expect(output).to include('spec/spec_helper.rb')
-        expect(File.exists?('spec/spec_helper.rb')).to be true
+        expect(File.exist?('spec/spec_helper.rb')).to be true
       end
 
       xit "should generate a console script" do
         run_generator('taza', [APP_ROOT], generator_sources)
-        expect(File.exists?(File.join(APP_ROOT, 'script', 'console'))).to be true
+        expect(File.exist?(File.join(APP_ROOT, 'script', 'console'))).to be true
       end
 
       xit "should generate a windows console script" do
         run_generator('taza', [APP_ROOT], generator_sources)
-        expect(File.exists?(File.join(APP_ROOT, 'script', 'console.cmd'))).to be true
+        expect(File.exist?(File.join(APP_ROOT, 'script', 'console.cmd'))).to be true
       end
     end
   end
diff --git a/spec/generators/site_generator_spec.rb b/spec/generators/site_generator_spec.rb
@@ -9,7 +9,7 @@
 
       it 'foo_site.rb' do
         expect(output).to include('lib/sites/foo_site.rb')
-        expect(File.exists?('lib/sites/foo_site.rb')).to be true
+        expect(File.exist?('lib/sites/foo_site.rb')).to be true
       end
 
       it 'lib/sites/foo_site' do
@@ -34,7 +34,7 @@
 
       it 'config/foo_site.yml' do
         expect(output).to include("config/foo_site.yml")
-        expect(File.exists?('config/foo_site.yml')).to be true
+        expect(File.exist?('config/foo_site.yml')).to be true
       end
 
       it 'does not overwrite existing site' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -8,7 +8,6 @@
 
 RSpec.configure do |config|
   config.mock_with :mocha
-
   config.before(:each) do
     $0 = 'home'
     ARGV.clear
@@ -35,7 +34,7 @@ def capture_stdout
 end
 
 def null_device
-  File.exists?('/dev/null') ? '/dev/null' : 'NUL'
+  File.exist?('/dev/null') ? '/dev/null' : 'NUL'
 end
 
 # Must set before requiring generator libs.
diff --git a/spec/taza/browser_spec.rb b/spec/taza/browser_spec.rb
@@ -13,13 +13,13 @@
   end
 
   it "should raise unknown browser error for unsupported watir browsers" do
-    expect(lambda { Taza::Browser.create(:browser => :foo_browser_9000,:driver => :watir) }).to raise_error(StandardError)
+    expect { Taza::Browser.create(:browser => :foo_browser_9000, :driver => :watir) }.to raise_error(StandardError)
   end
 
   it "should use params browser type when creating selenium" do
     skip "Travis cant load selenium. :("
     browser_type = :opera
-    Selenium::SeleniumDriver.expects(:new).with(anything,anything,'*opera',anything)
+    Selenium::SeleniumDriver.expects(:new).with(anything, anything, '*opera', anything)
     Taza::Browser.create(:browser => browser_type, :driver => :selenium)
   end
 
@@ -43,19 +43,19 @@
   end
 
   it "should use environment settings for server port and ip" do
-    #TODO:we need to make this more dynamic and move the skeleton project to the temp dir
-    Taza::Settings.stubs(:path).returns(File.join(@original_directory,'spec','sandbox'))
+    # TODO:we need to make this more dynamic and move the skeleton project to the temp dir
+    Taza::Settings.stubs(:path).returns(File.join(@original_directory, 'spec', 'sandbox'))
     ENV['SERVER_PORT'] = 'server_port'
     ENV['SERVER_IP'] = 'server_ip'
-    Selenium::SeleniumDriver.expects(:new).with('server_ip','server_port',anything,anything)
+    Selenium::SeleniumDriver.expects(:new).with('server_ip', 'server_port', anything, anything)
     Taza::Browser.create(
-        Taza::Settings.config("SiteName"))
+      Taza::Settings.config("SiteName"))
   end
 
   it "should use environment settings for timeout" do
-    Taza::Settings.stubs(:path).returns(File.join(@original_directory,'spec','sandbox'))
+    Taza::Settings.stubs(:path).returns(File.join(@original_directory, 'spec', 'sandbox'))
     ENV['TIMEOUT'] = 'timeout'
-    Selenium::SeleniumDriver.expects(:new).with(anything,anything,anything,'timeout')
+    Selenium::SeleniumDriver.expects(:new).with(anything, anything, anything, 'timeout')
     Taza::Browser.create(Taza::Settings.config("SiteName"))
   end
 
diff --git a/spec/taza/fixtures_spec.rb b/spec/taza/fixtures_spec.rb
@@ -13,7 +13,7 @@
   end
 
   it "should still raise method missing error" do
-    expect(lambda { zomgwtf(:first_example) }).to raise_error(NoMethodError)
+    expect{ zomgwtf(:first_example) }.to raise_error(NoMethodError)
   end
 
   # TODO: this test tests what is in entity's instance eval not happy with it being here
@@ -31,7 +31,7 @@
   end
 
   it "should not be able to access fixtures in sub-folders if not included" do
-    expect(lambda { bars(:foo) }).to raise_error(NoMethodError)
+    expect{ bars(:foo) }.to raise_error(NoMethodError)
   end
 
   it "should template fixture files" do
diff --git a/spec/taza/page_module_spec.rb b/spec/taza/page_module_spec.rb
@@ -27,7 +27,7 @@ class AnotherPageWithModule < ::Taza::Page
 
 
   it "should not execute elements that belong to a page module but accessed without it" do
-    expect(lambda { AnotherPageWithModule.new.another_module_element }).to raise_error(NoMethodError)
+    expect{ AnotherPageWithModule.new.another_module_element }.to raise_error(NoMethodError)
   end
 
   it "should execute elements in the context of their page module when accessed with it" do
@@ -100,7 +100,7 @@ def false_filter
 
   it "should raise an error for page-module filters that return false" do
     page = PageWithFalseFilterAndModule.new(:module)
-    expect(lambda { page.sample_element }).to raise_error(Taza::FilterError)
+    expect{ page.sample_element }.to raise_error(Taza::FilterError)
   end
 
   class PageWithFilterAndModuleElements < ::Taza::Page
@@ -116,7 +116,7 @@ def sample_filter
 
   it "should execute filters for elements inside page modules" do
     page = PageWithFilterAndModuleElements.new(:module)
-    expect(lambda { page.sample_element }).to raise_error(Taza::FilterError)
+    expect{ page.sample_element }.to raise_error(Taza::FilterError)
   end
 
   class PageWithFiltersAndModuleElements < ::Taza::Page
@@ -139,7 +139,7 @@ def another_sample_filter
 
   it "should execute filters for specific and all elements inside page modules" do
     page = PageWithFiltersAndModuleElements.new(:module)
-    expect(lambda { page.sample_element }).to raise_error(Taza::FilterError)
+    expect{ page.sample_element }.to raise_error(Taza::FilterError)
     expect(page.another_sample_element).to eql :something
   end
 
@@ -167,7 +167,7 @@ def bar_filter
     foo = PageWithFiltersAndModulesAndElements.new(:foo_module)
     expect(foo.sample_element).to eql :something
     bar = PageWithFiltersAndModulesAndElements.new(:bar_module)
-    expect(lambda { bar.sample_element }).to raise_error(Taza::FilterError)
+    expect{ bar.sample_element }.to raise_error(Taza::FilterError)
   end
 
 end
diff --git a/spec/taza/page_spec.rb b/spec/taza/page_spec.rb
diff --git a/spec/taza/settings_spec.rb b/spec/taza/settings_spec.rb
diff --git a/spec/taza/site_fixtures_spec.rb b/spec/taza/site_fixtures_spec.rb
diff --git a/spec/taza/site_spec.rb b/spec/taza/site_spec.rb
diff --git a/taza.gemspec b/taza.gemspec

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ source "https://rubygems.org"`
`2`	`2`
`3`	`3`	`gemspec`
`4`	`4`
`5`		`-gem 'activesupport', '~> 4.0.2'`
	`5`	`+gem 'activesupport', '~> 7.1.0'`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ source "https://rubygems.org"`
`2`	`2`
`3`	`3`	`gemspec`
`4`	`4`
`5`		`-gem 'activesupport', '~> 4.1.0'`
	`5`	`+gem 'activesupport', '~> 7.2.0'`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ source "https://rubygems.org"`
`2`	`2`
`3`	`3`	`gemspec`
`4`	`4`
`5`		`-gem 'activesupport', '~> 4.2.0'`
	`5`	`+gem 'activesupport', '~> 8.0.0'`