ruby_raider 3.13.0 → 4.0.0

data/spec/integration/generators/automation_generator_spec.rb

@@ -17,8 +17,8 @@ describe AutomationGenerator do
       expect(File).to exist("#{name}/page_objects/abstract/component.rb")
     end
 
-    it 'creates a component file' do
-      expect(File).to exist("#{name}/page_objects/components/header.rb")
+    it 'creates no header component' do
+      expect(File).not_to exist("#{name}/page_objects/components/header.rb")
     end
   end
 
@@ -40,18 +40,6 @@ describe AutomationGenerator do
     include_examples 'creates web automation framework', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
   end
 
-  context 'with rspec and watir' do
-    include_examples 'creates web automation framework', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-  end
-
-  context 'with cucumber and selenium' do
-    include_examples 'creates web automation framework', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-  end
-
-  context 'with cucumber and watir' do
-    include_examples 'creates web automation framework', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-  end
-
   context 'with rspec and appium android' do
     include_examples 'creates mobile automation framework', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
   end
@@ -60,20 +48,8 @@ describe AutomationGenerator do
     include_examples 'creates mobile automation framework', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
   end
 
-  context 'with cucumber and appium android' do
-    include_examples 'creates mobile automation framework', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-  end
-
-  context 'with cucumber and appium ios' do
-    include_examples 'creates mobile automation framework', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-  end
-
-  context 'with cucumber and appium cross platform' do
-    include_examples 'creates mobile automation framework', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-  end
-
   describe 'without example tests' do
-    %w[rspec cucumber].product(%w[selenium ios cross_platform]).each do |framework, automation|
+    %w[rspec].product(%w[selenium ios cross_platform]).each do |framework, automation|
       context "with #{framework} and #{automation}" do
         let(:name) { ensure_project(framework:, automation:, examples: false) }
 
@@ -110,15 +86,5 @@ describe AutomationGenerator do
         expect(Dir.children("#{name}/page_objects/components")).to eq(['.keep'])
       end
     end
-
-    context 'with watir' do
-      it 'still creates the examples, because the Watir templates are frozen' do
-        InvokeGenerators.generate_framework(framework: 'rspec', automation: 'watir', name: 'skeleton_watir',
-                                            examples: false)
-        expect(File).to exist('skeleton_watir/page_objects/pages/login.rb')
-      ensure
-        FileUtils.rm_rf('skeleton_watir')
-      end
-    end
   end
 end

data/spec/integration/generators/axe_addon_spec.rb

@@ -11,8 +11,8 @@ describe 'Axe accessibility addon generation' do
   # rubocop:disable RSpec/BeforeAfterAll, RSpec/InstanceVariable
   before(:all) do
     @axe_projects = []
-    %w[rspec cucumber].each do |framework|
-      %w[selenium watir].each do |automation|
+    %w[rspec].each do |framework|
+      %w[selenium].each do |automation|
         name = "axe_#{framework}_#{automation}"
         @axe_projects << name
         InvokeGenerators.generate_framework(
@@ -45,39 +45,6 @@ describe 'Axe accessibility addon generation' do
     end
   end
 
-  context 'with cucumber and selenium' do
-    let(:name) { 'axe_cucumber_selenium' }
-
-    it 'creates accessibility.feature' do
-      expect(File).to exist("#{name}/features/accessibility.feature")
-    end
-
-    it 'creates accessibility_steps.rb' do
-      expect(File).to exist("#{name}/features/step_definitions/accessibility_steps.rb")
-    end
-
-    it 'includes axe gems in Gemfile' do
-      gemfile = File.read("#{name}/Gemfile")
-      expect(gemfile).to include('axe')
-    end
-  end
-
-  context 'with rspec and watir' do
-    let(:name) { 'axe_rspec_watir' }
-
-    it 'creates accessibility_spec.rb' do
-      expect(File).to exist("#{name}/spec/accessibility_spec.rb")
-    end
-  end
-
-  context 'with cucumber and watir' do
-    let(:name) { 'axe_cucumber_watir' }
-
-    it 'creates accessibility.feature' do
-      expect(File).to exist("#{name}/features/accessibility.feature")
-    end
-  end
-
   context 'without accessibility flag' do
     let(:name) { 'no_axe_rspec_selenium' }
 

data/spec/integration/generators/azure_generator_spec.rb

@@ -8,7 +8,7 @@ require_relative '../spec_helper'
 
 describe AzureGenerator do
   mobile_notice = "Azure Pipelines template for mobile projects is not available yet; see the README.\n"
-  web = FRAMEWORKS.product(%w[selenium watir], [false, true])
+  web = FRAMEWORKS.product(%w[selenium], [false, true])
   mobile = FRAMEWORKS.product(%w[ios android cross_platform])
 
   after(:all) do # rubocop:disable RSpec/BeforeAfterAll

data/spec/integration/generators/common_generator_spec.rb

@@ -48,24 +48,6 @@ describe CommonGenerator do
     include_examples 'creates a gitignore file', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
   end
 
-  context 'with rspec and watir' do
-    include_examples 'creates common files', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-    include_examples 'creates a config file', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-    include_examples 'creates a gitignore file', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-  end
-
-  context 'with cucumber and selenium' do
-    include_examples 'creates common files', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-    include_examples 'creates a config file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-    include_examples 'creates a gitignore file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-  end
-
-  context 'with cucumber and watir' do
-    include_examples 'creates common files', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-    include_examples 'creates a config file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-    include_examples 'creates a gitignore file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-  end
-
   context 'with rspec and appium android' do
     include_examples 'creates common files', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
     include_examples 'creates a capabilities file', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
@@ -80,27 +62,6 @@ describe CommonGenerator do
     include_examples 'creates a gitignore file', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
   end
 
-  context 'with cucumber and appium android' do
-    include_examples 'creates common files', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-    include_examples 'creates a capabilities file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-    include_examples "doesn't create a config file", "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-    include_examples 'creates a gitignore file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-  end
-
-  context 'with cucumber and appium ios' do
-    include_examples 'creates common files', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-    include_examples 'creates a capabilities file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-    include_examples "doesn't create a config file", "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-    include_examples 'creates a gitignore file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-  end
-
-  context 'with cucumber and appium cross platform' do
-    include_examples 'creates common files', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'creates a capabilities file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'creates a config file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'creates a gitignore file', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-  end
-
   context 'with rspec and appium cross platform' do
     include_examples 'creates common files', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
     include_examples 'creates a capabilities file', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
@@ -109,7 +70,7 @@ describe CommonGenerator do
   end
 
   describe 'without example tests' do
-    %w[rspec cucumber].product(%w[selenium ios cross_platform]).each do |framework, automation|
+    %w[rspec].product(%w[selenium ios cross_platform]).each do |framework, automation|
       context "with #{framework} and #{automation}" do
         let(:name) { ensure_project(framework:, automation:, examples: false) }
         let(:ci_file) { automation == 'selenium' ? 'test_pipeline.yml' : 'appium_pipeline.yml' }

data/spec/integration/generators/config_features_spec.rb

@@ -8,7 +8,7 @@ describe 'Config features for generated projects' do
   include InvokeGenerators
 
   after(:all) do # rubocop:disable RSpec/BeforeAfterAll
-    %w[config_selenium_test config_watir_test].each do |name|
+    %w[config_selenium_test].each do |name|
       FileUtils.rm_rf(name)
     end
   end
@@ -51,27 +51,4 @@ describe 'Config features for generated projects' do
       expect { RubyVM::InstructionSequence.compile(helper) }.not_to raise_error
     end
   end
-
-  describe 'timeout in Watir helper' do
-    before(:all) do # rubocop:disable RSpec/BeforeAfterAll
-      InvokeGenerators.generate_framework(
-        automation: 'watir', framework: 'rspec', name: 'config_watir_test'
-      )
-    end
-
-    it 'sets Watir.default_timeout from config' do
-      helper = File.read('config_watir_test/helpers/browser_helper.rb')
-      expect(helper).to include("Watir.default_timeout = config.fetch('timeout', 10)")
-    end
-
-    it 'generates spec_helper with viewport-aware window setup' do
-      helper = File.read('config_watir_test/helpers/spec_helper.rb')
-      expect(helper).to include('viewport')
-    end
-
-    it 'generates spec_helper with valid Ruby syntax' do
-      helper = File.read('config_watir_test/helpers/spec_helper.rb')
-      expect { RubyVM::InstructionSequence.compile(helper) }.not_to raise_error
-    end
-  end
 end

data/spec/integration/generators/github_generator_spec.rb

@@ -13,16 +13,4 @@ describe GithubGenerator do
   context 'with rspec and selenium' do
     include_examples 'generates github actions', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
   end
-
-  context 'with rspec and watir' do
-    include_examples 'generates github actions', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-  end
-
-  context 'with cucumber and selenium' do
-    include_examples 'generates github actions', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-  end
-
-  context 'with cucumber and watir' do
-    include_examples 'generates github actions', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-  end
 end

data/spec/integration/generators/helpers_generator_spec.rb

@@ -28,21 +28,14 @@ describe HelpersGenerator do
     end
   end
 
-  shared_examples 'creates watir helpers' do |name|
-    it 'creates a browser helper file' do
-      expect(File).to exist("#{name}/helpers/browser_helper.rb")
-    end
-
-    it 'does not create the wait helper or the element wrapper' do
+  shared_examples 'has no wait helper' do |name|
+    it 'creates neither the wait helper nor the element wrapper, and no Ruby file mentions them' do
       expect(File).not_to exist("#{name}/helpers/wait_helper.rb")
       expect(File).not_to exist("#{name}/helpers/raider_element.rb")
-    end
-  end
-
-  shared_examples 'creates the wait helper' do |name|
-    it 'creates the wait helper and the element wrapper' do
-      expect(File).to exist("#{name}/helpers/wait_helper.rb")
-      expect(File).to exist("#{name}/helpers/raider_element.rb")
+      files = Dir.glob("#{name}/{helpers,page_objects,spec,config}/**/*.rb")
+      expect(files).not_to be_empty
+      mentions = files.select { |file| File.read(file).match?(/WaitHelper|RaiderElement/) }
+      expect(mentions).to eq([])
     end
   end
 
@@ -58,15 +51,33 @@ describe HelpersGenerator do
     end
   end
 
-  shared_examples 'creates rspec helpers' do |name|
-    it 'creates a spec helper file' do
-      expect(File).to exist("#{name}/helpers/spec_helper.rb")
+  shared_examples 'creates the network helper' do |name|
+    it 'creates the network helper' do
+      expect(File).to exist("#{name}/helpers/network_helper.rb")
+    end
+  end
+
+  shared_examples 'creates the screenshot helper' do |name|
+    it 'creates the screenshot helper' do
+      expect(File).to exist("#{name}/helpers/screenshot_helper.rb")
     end
   end
 
-  shared_examples 'creates cucumber helpers' do |name|
-    it 'does not create a spec helper' do
-      expect(File).not_to exist("#{name}/helpers/spec_helper.rb")
+  shared_examples 'skips the screenshot helper' do |name|
+    it 'does not create the screenshot helper' do
+      expect(File).not_to exist("#{name}/helpers/screenshot_helper.rb")
+    end
+  end
+
+  shared_examples 'skips the network helper' do |name|
+    it 'does not create the network helper' do
+      expect(File).not_to exist("#{name}/helpers/network_helper.rb")
+    end
+  end
+
+  shared_examples 'creates rspec helpers' do |name|
+    it 'creates a spec helper file' do
+      expect(File).to exist("#{name}/helpers/spec_helper.rb")
     end
   end
 
@@ -76,109 +87,92 @@ describe HelpersGenerator do
     end
   end
 
+  shared_examples 'creates the gesture helper' do |name|
+    it 'creates a gesture helper with swipe, scroll and scroll_to only' do
+      content = File.read("#{name}/helpers/gesture_helper.rb")
+      expect(content).to include('def swipe(').and include('def scroll(').and include('def scroll_to(')
+      expect(content).to include('module GestureHelper')
+      expect(content).not_to match(/hover|drag_and_drop/)
+    end
+  end
+
+  shared_examples 'skips the gesture helper' do |name|
+    it 'does not create a gesture helper' do
+      expect(File).not_to exist("#{name}/helpers/gesture_helper.rb")
+    end
+  end
+
   context 'with rspec and selenium' do
+    include_examples 'skips the gesture helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
     include_examples 'creates common helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
     include_examples 'creates the trace helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
+    include_examples 'creates the network helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
+    include_examples 'creates the screenshot helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
     include_examples 'creates a session state helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
     include_examples 'creates selenium helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
-    include_examples 'creates the wait helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
+    include_examples 'has no wait helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
     include_examples 'creates rspec helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
   end
 
-  context 'with rspec and watir' do
-    include_examples 'creates common helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-    include_examples 'skips the trace helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-    include_examples 'creates a session state helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-    include_examples 'creates watir helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-    include_examples 'creates rspec helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}"
-  end
-
-  context 'with cucumber and selenium' do
-    include_examples 'creates common helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-    include_examples 'creates the trace helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-    include_examples 'creates a session state helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-    include_examples 'creates selenium helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-    include_examples 'creates the wait helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-    include_examples 'creates cucumber helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::SELENIUM}"
-  end
-
-  context 'with cucumber and watir' do
-    include_examples 'creates common helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-    include_examples 'skips the trace helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-    include_examples 'creates a session state helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-    include_examples 'creates watir helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-    include_examples 'creates cucumber helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::WATIR}"
-  end
-
   context 'with rspec and appium android' do
     include_examples 'creates common helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
     include_examples 'skips the trace helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
+    include_examples 'skips the network helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
+    include_examples 'skips the screenshot helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
     include_examples 'skips the session state helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
     include_examples 'creates selenium helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
-    include_examples 'creates the wait helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
+    include_examples 'has no wait helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
+    include_examples 'creates the gesture helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
     include_examples 'creates rspec helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}"
   end
 
   context 'with rspec and appium ios' do
     include_examples 'creates common helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
     include_examples 'skips the trace helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
+    include_examples 'skips the network helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
+    include_examples 'skips the screenshot helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
     include_examples 'skips the session state helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
     include_examples 'creates selenium helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
-    include_examples 'creates the wait helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
+    include_examples 'has no wait helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
+    include_examples 'creates the gesture helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
     include_examples 'creates rspec helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::IOS}"
   end
 
-  context 'with cucumber and appium android' do
-    include_examples 'creates common helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-    include_examples 'skips the trace helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-    include_examples 'skips the session state helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-    include_examples 'creates selenium helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-    include_examples 'creates the wait helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-    include_examples 'creates cucumber helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::ANDROID}"
-  end
-
-  context 'with cucumber and appium ios' do
-    include_examples 'creates common helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-    include_examples 'skips the trace helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-    include_examples 'skips the session state helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-    include_examples 'creates selenium helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-    include_examples 'creates the wait helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-    include_examples 'creates cucumber helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::IOS}"
-  end
-
   context 'with rspec and appium cross platform' do
     include_examples 'creates common helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
     include_examples 'skips the trace helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
+    include_examples 'skips the network helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
+    include_examples 'skips the screenshot helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
     include_examples 'skips the session state helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
     include_examples 'creates selenium helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'creates the wait helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
+    include_examples 'has no wait helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
+    include_examples 'creates the gesture helper', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
     include_examples 'creates rspec helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
     include_examples 'creates cross platform helpers', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::CROSS_PLATFORM}"
   end
 
-  context 'with cucumber and appium cross platform' do
-    include_examples 'creates common helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'skips the trace helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'skips the session state helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'creates selenium helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'creates the wait helper', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'creates cucumber helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-    include_examples 'creates cross platform helpers', "#{FrameworkIndex::CUCUMBER}_#{AutomationIndex::CROSS_PLATFORM}"
-  end
-
   describe 'without example tests' do
-    %w[rspec cucumber].product(%w[selenium ios cross_platform]).each do |framework, automation|
+    %w[rspec].product(%w[selenium ios cross_platform]).each do |framework, automation|
       context "with #{framework} and #{automation}" do
         let(:name) { ensure_project(framework:, automation:, examples: false) }
 
-        it 'creates the wait helper and RaiderElement' do
-          expect(File).to exist("#{name}/helpers/wait_helper.rb")
-          expect(File).to exist("#{name}/helpers/raider_element.rb")
+        include_examples 'has no wait helper', "#{framework}_#{automation}"
+
+        it "#{automation == 'selenium' ? 'skips' : 'creates'} the gesture helper" do
+          expect(File.exist?("#{name}/helpers/gesture_helper.rb")).to eq(automation != 'selenium')
         end
 
         it "#{automation == 'selenium' ? 'creates' : 'skips'} the trace helper" do
           expect(File.exist?("#{name}/helpers/trace_helper.rb")).to eq(automation == 'selenium')
         end
+
+        it "#{automation == 'selenium' ? 'creates' : 'skips'} the network helper" do
+          expect(File.exist?("#{name}/helpers/network_helper.rb")).to eq(automation == 'selenium')
+        end
+
+        it "#{automation == 'selenium' ? 'creates' : 'skips'} the screenshot helper" do
+          expect(File.exist?("#{name}/helpers/screenshot_helper.rb")).to eq(automation == 'selenium')
+        end
       end
     end
 

data/spec/integration/generators/invoke_generators_spec.rb

@@ -9,13 +9,13 @@ describe InvokeGenerators do
   after { FileUtils.rm_rf(Dir.glob('case_*')) }
 
   context 'with option values in a different case' do
-    it 'accepts framework:Cucumber and automation:Selenium' do
-      described_class.generate_framework(framework: 'Cucumber', automation: 'Selenium', name: 'case_mixed')
-      expect(File).to exist('case_mixed/cucumber.yml')
+    it 'accepts framework:Rspec and automation:Selenium' do
+      described_class.generate_framework(framework: 'Rspec', automation: 'Selenium', name: 'case_mixed')
+      expect(File).to exist('case_mixed/.rspec')
     end
 
     it 'accepts upper-case values' do
-      described_class.generate_framework(framework: 'RSPEC', automation: 'WATIR', name: 'case_upper')
+      described_class.generate_framework(framework: 'RSPEC', automation: 'SELENIUM', name: 'case_upper')
       expect(File).to exist('case_upper/.rspec')
     end
 
@@ -28,10 +28,10 @@ describe InvokeGenerators do
   context 'with raider new and capitalised options' do
     it 'generates the project and exits zero' do
       root = File.expand_path('../../..', __dir__)
-      _out, status = Open3.capture2e('ruby', "#{root}/bin/raider", 'new', 'case_cli', '-p', 'framework:Cucumber',
+      _out, status = Open3.capture2e('ruby', "#{root}/bin/raider", 'new', 'case_cli', '-p', 'framework:Rspec',
                                      'automation:Selenium')
       expect(status.exitstatus).to eq(0)
-      expect(File).to exist('case_cli/cucumber.yml')
+      expect(File).to exist('case_cli/.rspec')
     end
   end
 
@@ -59,41 +59,58 @@ describe InvokeGenerators do
     it 'keeps the examples by default' do
       expect(described_class.collect_flags(automation: 'selenium')).not_to include('no_examples')
     end
+  end
+
+  context 'with an unsupported automation' do
+    it 'lists the supported automations only' do
+      expect(described_class::AUTOMATIONS).to eq(%w[selenium ios android cross_platform])
+    end
 
-    it 'keeps the examples for watir, whose templates are frozen' do
-      expect(described_class.collect_flags(automation: 'watir', examples: false)).not_to include('no_examples')
+    it 'raises the Invalid automation error and writes nothing' do
+      expect { described_class.generate_framework(framework: 'rspec', automation: 'watir', name: 'case_watir') }
+        .to raise_error(Thor::Error, 'Invalid automation "watir". Allowed values: selenium, ios, android, cross_platform')
+      expect(File).not_to exist('case_watir')
     end
   end
 
-  context 'with the Watir deprecation notice' do
-    let(:notice) do
-      'Watir is deprecated and will be removed in the next major version of ruby_raider; new projects should use Selenium.'
+  context 'with the RSpec-only framework choice' do
+    it 'lists rspec as the only framework' do
+      expect(described_class::FRAMEWORKS).to eq(%w[rspec])
     end
 
-    it 'prints it for watir' do
-      expect { described_class.generate_framework(framework: 'rspec', automation: 'watir', name: 'case_dep') }
-        .to output(/#{Regexp.escape(notice)}/).to_stdout
+    it 'rejects framework minitest with the allowed values' do
+      expect { described_class.generate_framework(framework: 'minitest', automation: 'selenium', name: 'case_min') }
+        .to raise_error(Thor::Error, 'Invalid framework "minitest". Allowed values: rspec')
     end
 
-    it 'does not print it for selenium' do
-      expect { described_class.generate_framework(framework: 'rspec', automation: 'selenium', name: 'case_nodep') }
-        .not_to output(/Watir is deprecated/).to_stdout
+    it 'rejects framework cucumber like any unknown framework' do
+      expect { described_class.generate_framework(framework: 'Cucumber', automation: 'selenium', name: 'case_cuke') }
+        .to raise_error(Thor::Error, 'Invalid framework "cucumber". Allowed values: rspec')
+      expect(File).not_to exist('case_cuke')
     end
 
-    it 'still prints it for raider new with automation:watir' do
-      root = File.expand_path('../../..', __dir__)
-      out, status = Open3.capture2e('ruby', "#{root}/bin/raider", 'new', 'case_cli_watir', '-p',
-                                    'framework:rspec', 'automation:watir')
-      expect(status.success?).to be(true)
-      expect(out).to include(notice)
-      expect(File).to exist('case_cli_watir/.rspec')
+    %w[framework:cucumber framework:Cucumber].each do |arg|
+      it "exits 1 for raider new with #{arg} and leaves no directory" do
+        root = File.expand_path('../../..', __dir__)
+        Dir.mktmpdir do |dir|
+          _out, err, status = Open3.capture3('ruby', "#{root}/bin/raider", 'new', 'x', '-p', arg,
+                                             'automation:selenium', chdir: dir)
+          expect(status.exitstatus).to eq(1)
+          expect(err).to include('Invalid framework "cucumber". Allowed values: rspec')
+          expect(File).not_to exist(File.join(dir, 'x'))
+        end
+      end
     end
-  end
 
-  context 'with examples false for watir' do
-    it 'says the examples are kept' do
-      expect { described_class.generate_framework(framework: 'rspec', automation: 'watir', name: 'case_watir', examples: false) }
-        .to output(/Watir projects always include the example tests/).to_stdout
+    it 'defaults to rspec when no framework is given' do
+      root = File.expand_path('../../..', __dir__)
+      Dir.mktmpdir do |dir|
+        _out, _err, status = Open3.capture3('ruby', "#{root}/bin/raider", 'new', 'x', '-p',
+                                            'automation:selenium', chdir: dir)
+        expect(status.exitstatus).to eq(0)
+        expect(File).to exist(File.join(dir, 'x/spec'))
+        expect(File).not_to exist(File.join(dir, 'x/features'))
+      end
     end
   end
 end
@@ -107,30 +124,22 @@ describe 'Projects named like a generator option' do
     expect(File).to exist('no_examples/page_objects/pages/login.rb')
   end
 
-  it 'gives a Selenium project named watir the wait helper it wires in' do
-    InvokeGenerators.generate_framework(automation: 'selenium', framework: 'cucumber', name: 'watir')
-    expect(File).to exist('watir/helpers/wait_helper.rb')
-    expect(File.read('watir/features/support/env.rb')).not_to include('Watir')
-    expect(File.read('watir/page_objects/abstract/page.rb')).to include('include WaitHelper')
-  end
-
-  it 'keeps a Watir project named selenium on Watir' do
-    InvokeGenerators.generate_framework(automation: 'watir', framework: 'rspec', name: 'selenium')
-    expect(File).not_to exist('selenium/helpers/wait_helper.rb')
-    expect(File.read('selenium/page_objects/abstract/page.rb')).to include('browser.element')
-    expect(File.read('selenium/page_objects/abstract/page.rb')).not_to include('find_element')
+  it 'gives a Selenium project named watir the runtime helpers and no wait helper' do
+    InvokeGenerators.generate_framework(automation: 'selenium', framework: 'rspec', name: 'watir')
+    expect(File).not_to exist('watir/helpers/wait_helper.rb')
+    expect(File.read('watir/helpers/spec_helper.rb')).not_to include('Watir')
+    expect(File.read('watir/page_objects/abstract/page.rb')).to include('include Raider::Helpers')
   end
 end
 
 describe 'Option-named projects generate what a neutral name generates' do
-  option_names = %w[ios android cucumber rspec cross_platform axe_addon selenium watir no_examples azure]
+  option_names = %w[ios android rspec cross_platform axe_addon selenium watir no_examples azure]
   option_sets = [
     { automation: 'selenium', framework: 'rspec' },
-    { automation: 'selenium', framework: 'cucumber', accessibility: true },
+    { automation: 'selenium', framework: 'rspec', accessibility: true },
     { automation: 'selenium', framework: 'rspec', examples: false, ci: 'azure' },
-    { automation: 'watir', framework: 'cucumber' },
     { automation: 'ios', framework: 'rspec' },
-    { automation: 'android', framework: 'cucumber' },
+    { automation: 'android', framework: 'rspec' },
     { automation: 'cross_platform', framework: 'rspec' }
   ].freeze
 

data/spec/integration/generators/rspec_generator_spec.rb

@@ -26,12 +26,6 @@ describe RspecGenerator do
                      "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}", 'login'
   end
 
-  context 'with rspec and watir' do
-    include_examples 'creates factory files', "#{FrameworkIndex::RSPEC}_#{AutomationIndex::SELENIUM}"
-    include_examples 'creates rspec files examples',
-                     "#{FrameworkIndex::RSPEC}_#{AutomationIndex::WATIR}", 'login'
-  end
-
   context 'with rspec and appium android' do
     include_examples 'creates rspec files examples',
                      "#{FrameworkIndex::RSPEC}_#{AutomationIndex::ANDROID}", 'pdp'