ruby_raider 3.0.1 → 3.1.0

data/lib/generators/cucumber/templates/env.tt

@@ -1,6 +1,4 @@
-<%- if capybara? -%>
-  <%= partial('capybara_env') -%>
-<%- elsif selenium_based? -%>
+<%- if selenium_based? -%>
   <%= partial('selenium_env') -%>
 <%- elsif mobile? -%>
   <%= partial('appium_env') -%>

data/lib/generators/cucumber/templates/partials/appium_env.tt

@@ -1,20 +1,15 @@
 require 'tmpdir'
 require_relative '../../helpers/allure_helper'
-require_relative '../../helpers/video_helper'
 
 Before do
   AllureHelper.configure
   driver.start_driver
-  @video_recorder = VideoHelper.recorder_for(driver)
-  @video_recorder&.start(self.class.to_s)
 end
 
 After do |scenario|
-  video_file = @video_recorder&.stop
-  AllureHelper.add_video(scenario.name, video_file)
   Dir.mktmpdir do |temp_folder|
     screenshot = driver.screenshot("#{temp_folder}/#{scenario.name}.png")
     AllureHelper.add_screenshot(scenario.name, screenshot)
   end
   driver.quit_driver
-end
+end

data/lib/generators/cucumber/templates/partials/selenium_env.tt

@@ -7,7 +7,6 @@ require 'rspec'
 require 'tmpdir'
 require 'yaml'
 require_relative '../../helpers/allure_helper'
-require_relative '../../helpers/video_helper'
 require_relative '../../helpers/debug_helper'
 
 Before do
@@ -17,8 +16,6 @@ Before do
   else
     driver.manage.window.maximize
   end
-  @video_recorder = VideoHelper.recorder_for(driver)
-  @video_recorder&.start(self.class.to_s)
   DebugHelper.enable_network_logging(driver)
   @debug_action_logger = DebugHelper.action_logger_for(self.class.to_s)
 end
@@ -29,8 +26,6 @@ After do |scenario|
     DebugHelper.capture_network_logs(DebugHelper.resolve_selenium_driver(driver), DebugHelper.sanitize(scenario.name))
   end
   @debug_action_logger&.close
-  video_file = @video_recorder&.stop
-  AllureHelper.add_video(scenario.name, video_file)
   Dir.mktmpdir do |temp_folder|
     screenshot = driver.save_screenshot("#{temp_folder}/#{scenario.name}.png")
     AllureHelper.add_screenshot(scenario.name, screenshot)

data/lib/generators/cucumber/templates/partials/watir_env.tt

@@ -3,7 +3,6 @@
 require 'tmpdir'
 require 'yaml'
 require_relative '../../helpers/allure_helper'
-require_relative '../../helpers/video_helper'
 require_relative '../../helpers/debug_helper'
 
 Before do
@@ -13,8 +12,6 @@ Before do
   else
     browser.window.maximize
   end
-  @video_recorder = VideoHelper.recorder_for(browser)
-  @video_recorder&.start(self.class.to_s)
   DebugHelper.enable_network_logging(browser)
   @debug_action_logger = DebugHelper.action_logger_for(self.class.to_s)
 end
@@ -25,8 +22,6 @@ After do |scenario|
     DebugHelper.capture_network_logs(DebugHelper.resolve_selenium_driver(browser), DebugHelper.sanitize(scenario.name))
   end
   @debug_action_logger&.close
-  video_file = @video_recorder&.stop
-  AllureHelper.add_video(scenario.name, video_file)
   Dir.mktmpdir do |temp_folder|
     screenshot = browser.screenshot.save("#{temp_folder}/#{scenario.name}.png")
     AllureHelper.add_screenshot(scenario.name, screenshot)

data/lib/generators/cucumber/templates/partials/web_steps.tt

@@ -9,8 +9,8 @@ require_relative '../../page_objects/pages/login'
 
 Given("I'm a {user} on the login page") do |user|
   @user = user
-  @login_page = <% if capybara? %>Login.new<% elsif watir? %>Login.new(browser)<% else %>Login.new(driver)<% end %>
-  @login_page.<% if capybara? %>visit_page<% else %>visit<% end %>
+  @login_page = <% if watir? %>Login.new(browser)<% else %>Login.new(driver)<% end %>
+  @login_page.visit
 end
 
 When('I login with my credentials') do
@@ -19,7 +19,7 @@ When('I login with my credentials') do
 end
 
 Then("I'm logged in") do
-  account_page = <% if capybara? %>Account.new<% elsif watir? %>Account.new(browser)<% else %>Account.new(driver)<% end %>
-  account_page.<% if capybara? %>visit_page<% else %>visit<% end %>
+  account_page = <% if watir? %>Account.new(browser)<% else %>Account.new(driver)<% end %>
+  account_page.visit
   expect(account_page.header.customer_name).to eq "Welcome back #{@user['name']}"
 end

data/lib/generators/cucumber/templates/world.tt

@@ -1,6 +1,4 @@
-<%- if capybara? -%>
-<%=- partial('capybara_world', strip: true) -%>
-<%- elsif watir? -%>
+<%- if watir? -%>
 <%=- partial('watir_world', strip: true) -%>
 <%- else -%>
 <%=- partial('driver_world', strip: true) -%>

data/lib/generators/generator.rb

@@ -7,8 +7,6 @@ class Generator < Thor::Group
   include Thor::Actions
   include TemplateRenderer
 
-  LATEST_RUBY = '3.4'
-
   argument :automation
   argument :framework
   argument :name
@@ -16,7 +14,7 @@ class Generator < Thor::Group
   def self.source_paths
     base_path = File.dirname(__FILE__)
     %W[#{base_path}/automation/templates #{base_path}/cucumber/templates
-       #{base_path}/rspec/templates #{base_path}/minitest/templates
+       #{base_path}/rspec/templates
        #{base_path}/templates #{base_path}/infrastructure/templates ]
   end
 
@@ -53,68 +51,26 @@ class Generator < Thor::Group
     args.include?('rspec')
   end
 
-  def minitest?
-    args.include?('minitest')
-  end
-
   def selenium?
     args.include?('selenium')
   end
 
-  def capybara?
-    args.include?('capybara')
-  end
-
-  def visual_addon?
-    args.include?('visual_addon')
-  end
-
   def watir?
     args.include?('watir')
   end
 
   def web?
-    (args & %w[selenium watir capybara]).count.positive?
+    (args & %w[selenium watir]).count.positive?
   end
 
   def axe_addon?
     args.include?('axe_addon')
   end
 
-  def lighthouse_addon?
-    args.include?('lighthouse_addon')
-  end
-
   def selenium_based?
     args.include?('selenium')
   end
 
-  def skip_allure?
-    args.include?('skip_allure')
-  end
-
-  def skip_video?
-    args.include?('skip_video')
-  end
-
-  def allure_reporter?
-    has_reporter = args.any? { |a| a&.start_with?('reporter_') }
-    has_reporter ? args.include?('reporter_allure') : !skip_allure?
-  end
-
-  def junit_reporter?
-    args.include?('reporter_junit')
-  end
-
-  def json_reporter?
-    args.include?('reporter_json')
-  end
-
-  def ruby_version
-    arg = args.find { |a| a&.start_with?('ruby_version:') }
-    arg ? arg.split(':', 2).last : LATEST_RUBY
-  end
-
   private
 
   def _initializer

data/lib/generators/helper_generator.rb

@@ -6,84 +6,46 @@ class HelpersGenerator < Generator
   def generate_helpers
     generate_browser_helper
     generate_driver_helper
-    generate_capybara_helper
     generate_appium_helper
     generate_allure_helper
-    generate_video_helper
     generate_debug_helper
-    generate_visual_helper
-    generate_performance_helper
-
-    if minitest?
-      generate_test_helper
-    else
-      generate_spec_helper
-    end
+    generate_spec_helper
   end
 
   private
 
   def generate_allure_helper
-    return unless allure_reporter?
-
     template('helpers/allure_helper.tt', "#{name}/helpers/allure_helper.rb")
   end
 
-  def generate_video_helper
-    return if skip_video?
-
-    template('helpers/video_helper.tt', "#{name}/helpers/video_helper.rb")
-  end
-
   def generate_browser_helper
-    return if selenium_based? || mobile? || capybara?
+    return if selenium_based? || mobile?
 
     template('helpers/browser_helper.tt', "#{name}/helpers/browser_helper.rb")
   end
 
   def generate_spec_helper
-    return if cucumber? || minitest?
+    return if cucumber?
 
     template('helpers/spec_helper.tt', "#{name}/helpers/spec_helper.rb")
   end
 
   def generate_driver_helper
-    return if watir? || capybara?
+    return if watir?
 
     template('helpers/driver_helper.tt', "#{name}/helpers/driver_helper.rb")
   end
 
-  def generate_capybara_helper
-    return unless capybara?
-
-    template('helpers/capybara_helper.tt', "#{name}/helpers/capybara_helper.rb")
-  end
-
   def generate_appium_helper
     return unless cross_platform?
 
     template('helpers/appium_helper.tt', "#{name}/helpers/appium_helper.rb")
   end
 
-  def generate_test_helper
-    template('helpers/test_helper.tt', "#{name}/helpers/test_helper.rb")
-  end
-
   def generate_debug_helper
     return unless web?
 
     template('helpers/debug_helper.tt', "#{name}/helpers/debug_helper.rb")
   end
 
-  def generate_visual_helper
-    return unless visual_addon? && web?
-
-    template('helpers/visual_helper.tt', "#{name}/helpers/visual_helper.rb")
-  end
-
-  def generate_performance_helper
-    return unless lighthouse_addon? && web?
-
-    template('helpers/performance_helper.tt', "#{name}/helpers/performance_helper.rb")
-  end
 end

data/lib/generators/infrastructure/templates/github.tt

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: <%= ruby_version %>.0
+          ruby-version: 3.4.0
           bundler-cache: true
 
       - name: Set up Chrome
@@ -34,7 +34,7 @@ jobs:
         run: mkdir -p allure-results
 
       - name: Run tests
-        run: <%- if framework == 'cucumber' -%>bundle exec cucumber features --format pretty<%- elsif minitest? -%>bundle exec ruby -Itest test/test_login_page.rb<%- else -%>bundle exec rspec spec --format documentation<%- end %>
+        run: <%- if framework == 'cucumber' -%>bundle exec cucumber features --format pretty<%- else -%>bundle exec rspec spec --format documentation<%- end %>
         env:
           HEADLESS: true
 

data/lib/generators/infrastructure/templates/github_appium.tt

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: <%= ruby_version %>.0
+          ruby-version: 3.4.0
           bundler-cache: true
 
       - name: Download iOS app
@@ -47,8 +47,6 @@ jobs:
       - name: Run tests
 <%- if cucumber? -%>
         run: bundle exec cucumber features/ --format pretty
-<%- elsif minitest? -%>
-        run: bundle exec ruby -Itest test/test_pdp_page.rb
 <%- else -%>
         run: bundle exec rspec spec/ --format documentation
 <%- end -%>
@@ -63,7 +61,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: <%= ruby_version %>.0
+          ruby-version: 3.4.0
           bundler-cache: true
 
       - name: Download Android app
@@ -98,8 +96,6 @@ jobs:
           script: |
 <%- if cucumber? -%>
             bundle exec cucumber features/ --format pretty
-<%- elsif minitest? -%>
-            bundle exec ruby -Itest test/test_pdp_page.rb
 <%- else -%>
             bundle exec rspec spec/ --format documentation
 <%- end -%>

data/lib/generators/invoke_generators.rb

@@ -1,10 +1,8 @@
 require_relative 'infrastructure/github_generator'
-require_relative 'infrastructure/gitlab_generator'
 require_relative 'automation/automation_generator'
 require_relative 'common_generator'
 require_relative 'cucumber/cucumber_generator'
 require_relative 'helper_generator'
-require_relative 'minitest/minitest_generator'
 require_relative 'rspec/rspec_generator'
 
 module InvokeGenerators
@@ -14,14 +12,13 @@ module InvokeGenerators
     generators = %w[Automation Common Helpers]
     framework = structure[:framework]
     add_generator(generators, framework.capitalize)
-    add_generator(generators, structure[:ci_platform].capitalize) if !structure[:skip_ci] && (structure[:ci_platform])
-    extra_args = collect_skip_flags(structure)
+    add_generator(generators, 'Github')
+    extra_args = collect_flags(structure)
     generators.each do |generator|
       invoke_generator({
                          automation: structure[:automation],
                          framework:,
                          generator:,
-                         ci_platform: structure[:ci_platform],
                          name: structure[:name],
                          extra_args:
                        })
@@ -36,7 +33,7 @@ module InvokeGenerators
   GENERATOR_CLASSES = Hash.new { |h, k| h[k] = Object.const_get("#{k}Generator") }
 
   def invoke_generator(structure = {})
-    args = [structure[:automation], structure[:framework], structure[:name], structure[:ci_platform]]
+    args = [structure[:automation], structure[:framework], structure[:name]]
     args.concat(structure[:extra_args] || [])
     generator_class = GENERATOR_CLASSES[structure[:generator]]
     generator = generator_class.new(args)
@@ -45,30 +42,12 @@ module InvokeGenerators
     generator.invoke_all
   end
 
-  def collect_skip_flags(structure)
+  def collect_flags(structure)
     flags = []
-    flags << 'skip_allure' if structure[:skip_allure]
-    flags << 'skip_video' if structure[:skip_video]
     flags << 'axe_addon' if structure[:accessibility] && !mobile_automation?(structure[:automation])
-    flags << 'visual_addon' if structure[:visual] && !mobile_automation?(structure[:automation])
-    flags << 'lighthouse_addon' if structure[:performance] && !mobile_automation?(structure[:automation])
-    flags << "ruby_version:#{structure[:ruby_version]}" if structure[:ruby_version]
-    flags.concat(reporter_flags(structure[:reporter]))
     flags
   end
 
-  def reporter_flags(reporter)
-    case reporter
-    when 'allure' then ['reporter_allure']
-    when 'junit' then ['reporter_junit']
-    when 'json' then ['reporter_json']
-    when 'both' then %w[reporter_allure reporter_junit]
-    when 'all' then %w[reporter_allure reporter_junit reporter_json]
-    when 'none' then ['reporter_none']
-    else []
-    end
-  end
-
   def mobile_automation?(automation)
     %w[ios android cross_platform].include?(automation)
   end

data/lib/generators/menu_generator.rb

@@ -29,12 +29,7 @@ class MenuGenerator
     structure = {
       automation: options[:automation],
       framework: options[:framework],
-      ci_platform: options[:ci_platform],
-      reporter: options[:reporter],
       accessibility: options[:accessibility],
-      visual: options[:visual],
-      performance: options[:performance],
-      ruby_version: options[:ruby_version],
       name: @name
     }
     generate_framework(structure)
@@ -74,88 +69,24 @@ class MenuGenerator
 
   def select_test_framework(automation)
     prompt.select('Please select your test framework') do |menu|
-      menu.choice :Cucumber, -> { select_ci_platform('Cucumber', automation) }
-      menu.choice :Rspec, -> { select_ci_platform('Rspec', automation) }
-      menu.choice :Minitest, -> { select_ci_platform('Minitest', automation) }
+      menu.choice :Cucumber, -> { select_accessibility('Cucumber', automation) }
+      menu.choice :Rspec, -> { select_accessibility('Rspec', automation) }
       menu.choice :Quit, -> { exit }
     end
   end
 
-  FrameworkOptions = Struct.new(:automation, :framework, :ci_platform, :reporter, :accessibility, :visual, :performance,
-                                :ruby_version)
+  FrameworkOptions = Struct.new(:automation, :framework, :accessibility)
 
   def create_framework_options(params)
-    FrameworkOptions.new(params[:automation], params[:framework], params[:ci_platform], params[:reporter],
-                         params[:accessibility], params[:visual], params[:performance], params[:ruby_version])
+    FrameworkOptions.new(params[:automation], params[:framework], params[:accessibility])
   end
 
-  def select_reporter(framework, automation_type, ci_platform = nil)
-    prompt.select('Select your test reporter') do |menu|
-      menu.choice :Allure, -> { select_accessibility(framework, automation_type, ci_platform, 'allure') }
-      menu.choice :JUnit, -> { select_accessibility(framework, automation_type, ci_platform, 'junit') }
-      menu.choice :JSON, -> { select_accessibility(framework, automation_type, ci_platform, 'json') }
-      menu.choice :Both, -> { select_accessibility(framework, automation_type, ci_platform, 'both') }
-      menu.choice :All, -> { select_accessibility(framework, automation_type, ci_platform, 'all') }
-      menu.choice :None, -> { select_accessibility(framework, automation_type, ci_platform, 'none') }
-      menu.choice :Quit, -> { exit }
-    end
-  end
-
-  def select_accessibility(framework, automation_type, ci_platform = nil, reporter = nil)
-    return create_framework(framework, automation_type, ci_platform:, reporter:) if mobile_automation?(automation_type)
+  def select_accessibility(framework, automation_type)
+    return create_framework(framework, automation_type) if mobile_automation?(automation_type)
 
     prompt.select('Add accessibility testing (axe)?') do |menu|
-      menu.choice :Yes, -> { select_visual(framework, automation_type, ci_platform, reporter, accessibility: true) }
-      menu.choice :No, -> { select_visual(framework, automation_type, ci_platform, reporter) }
-      menu.choice :Quit, -> { exit }
-    end
-  end
-
-  def select_visual(framework, automation_type, ci_platform = nil, reporter = nil, accessibility: false)
-    prompt.select('Add visual regression testing?') do |menu|
-      menu.choice :Yes, lambda {
-        select_performance(framework, automation_type, ci_platform, reporter, accessibility:, visual: true)
-      }
-      menu.choice :No, lambda {
-        select_performance(framework, automation_type, ci_platform, reporter, accessibility:)
-      }
-      menu.choice :Quit, -> { exit }
-    end
-  end
-
-  def select_performance(framework, automation_type, ci_platform = nil, reporter = nil, accessibility: false,
-                         visual: false)
-    prompt.select('Add Lighthouse performance auditing?') do |menu|
-      menu.choice :Yes, lambda {
-        select_ruby_version(framework, automation_type, ci_platform:, reporter:, accessibility:, visual:,
-                            performance: true)
-      }
-      menu.choice :No, lambda {
-        select_ruby_version(framework, automation_type, ci_platform:, reporter:, accessibility:, visual:)
-      }
-      menu.choice :Quit, -> { exit }
-    end
-  end
-
-  def select_ruby_version(framework, automation_type, ci_platform: nil, reporter: nil, accessibility: false,
-                          visual: false, performance: false)
-    prompt.select('Select Ruby version for your project') do |menu|
-      menu.choice :'3.4 (latest)', lambda {
-        create_framework(framework, automation_type, ci_platform:, reporter:, accessibility:, visual:, performance:,
-                         ruby_version: '3.4')
-      }
-      menu.choice :'3.3', lambda {
-        create_framework(framework, automation_type, ci_platform:, reporter:, accessibility:, visual:, performance:,
-                         ruby_version: '3.3')
-      }
-      menu.choice :'3.2', lambda {
-        create_framework(framework, automation_type, ci_platform:, reporter:, accessibility:, visual:, performance:,
-                         ruby_version: '3.2')
-      }
-      menu.choice :'3.1', lambda {
-        create_framework(framework, automation_type, ci_platform:, reporter:, accessibility:, visual:, performance:,
-                         ruby_version: '3.1')
-      }
+      menu.choice :Yes, -> { create_framework(framework, automation_type, accessibility: true) }
+      menu.choice :No, -> { create_framework(framework, automation_type) }
       menu.choice :Quit, -> { exit }
     end
   end
@@ -164,26 +95,15 @@ class MenuGenerator
     %w[ios android cross_platform].include?(automation_type)
   end
 
-  def create_framework(framework, automation_type, ci_platform: nil, reporter: nil, accessibility: false,
-                       visual: false, performance: false, ruby_version: nil)
+  def create_framework(framework, automation_type, accessibility: false)
     options = create_framework_options(automation: automation_type,
                                        framework: framework.downcase,
-                                       ci_platform:,
-                                       reporter:,
-                                       accessibility:,
-                                       visual:,
-                                       performance:,
-                                       ruby_version:)
+                                       accessibility:)
 
     puts 'Chosen Options:'
     puts "  Automation Type: #{options[:automation]}"
     puts "  Framework: #{options[:framework]}"
-    puts "  CI Platform: #{options[:ci_platform]}" if options[:ci_platform]
-    puts "  Reporter: #{options[:reporter]}" if options[:reporter]
     puts '  Accessibility: enabled' if options[:accessibility]
-    puts '  Visual Testing: enabled' if options[:visual]
-    puts '  Performance Auditing: enabled' if options[:performance]
-    puts "  Ruby Version: #{options[:ruby_version]}" if options[:ruby_version]
 
     set_up_framework(options)
     prompt.say("You have chosen to use #{framework} with #{automation_type}")
@@ -204,17 +124,7 @@ class MenuGenerator
 
   def automation_options(menu)
     menu.choice :Selenium, -> { choose_test_framework('selenium') }
-    menu.choice :Capybara, -> { choose_test_framework('capybara') }
     menu.choice :Appium, -> { choose_test_framework('appium') }
     menu.choice :Watir, -> { choose_test_framework('watir') }
   end
-
-  def select_ci_platform(framework, automation)
-    prompt.select('Would you like to configure CI?') do |menu|
-      menu.choice :'Github Actions', -> { select_reporter(framework, automation, 'github') }
-      menu.choice :'Gitlab CI/CD', -> { select_reporter(framework, automation, 'gitlab') }
-      menu.choice :No, -> { select_reporter(framework, automation) }
-      menu.choice :Quit, -> { exit }
-    end
-  end
 end

data/lib/generators/rspec/rspec_generator.rb

@@ -15,21 +15,10 @@ class RspecGenerator < Generator
     template('spec.tt', "#{name}/spec/pdp_page_spec.rb")
   end
 
-  def generate_visual_spec
-    return unless visual_addon? && web?
-
-    template('visual_spec.tt', "#{name}/spec/visual_spec.rb")
-  end
-
   def generate_accessibility_spec
     return unless axe_addon? && web?
 
     template('accessibility_spec.tt', "#{name}/spec/accessibility_spec.rb")
   end
 
-  def generate_performance_spec
-    return unless lighthouse_addon? && web?
-
-    template('performance_spec.tt', "#{name}/spec/performance_spec.rb")
-  end
 end

data/lib/generators/rspec/templates/accessibility_spec.tt

@@ -4,9 +4,7 @@ require_relative '../helpers/spec_helper'
 
 describe 'Accessibility' do
   before do
-    <% if capybara? -%>
-visit '/'
-    <% elsif watir? -%>
+    <% if watir? -%>
 browser.goto 'https://raider-test-site.onrender.com/'
     <% else -%>
 driver.get 'https://raider-test-site.onrender.com/'
@@ -14,9 +12,7 @@ driver.get 'https://raider-test-site.onrender.com/'
   end
 
   it 'has no accessibility violations on the page' do
-    <% if capybara? -%>
-expect(page).to be_axe_clean
-    <% elsif watir? -%>
+    <% if watir? -%>
 expect(browser.driver).to be_axe_clean
     <% else -%>
 expect(driver).to be_axe_clean

data/lib/generators/rspec/templates/spec.tt

@@ -1,4 +1,4 @@
-<%- if selenium_based? || watir? || capybara? -%>
+<%- if selenium_based? || watir? -%>
 # frozen_string_literal: true
 
 require_relative '../helpers/spec_helper'
@@ -10,16 +10,15 @@ require_relative '../page_objects/pages/login'
 # require 'debug'    # Ruby's built-in debugger (binding.break)
 # require 'pry'      # Pry debugger (binding.pry)
 
-<%- if selenium_based? || watir? || capybara? -%>
 describe 'Login' do
   subject(:header) { account_page.header.customer_name }
 
   let(:user) { ModelFactory.for('users')['registered user'] }
-  let(:login_page) { <% if capybara? -%>Login.new<% elsif watir? -%>Login.new(browser)<% else -%>Login.new(driver)<% end -%> }
-  let(:account_page) { <% if capybara? -%>Account.new<% elsif watir? -%>Account.new(browser)<% else -%>Account.new(driver)<% end -%> }
+  let(:login_page) { <% if watir? -%>Login.new(browser)<% else -%>Login.new(driver)<% end -%> }
+  let(:account_page) { <% if watir? -%>Account.new(browser)<% else -%>Account.new(driver)<% end -%> }
 
   before do
-    login_page.<% if capybara? -%>visit_page<% else -%>visit<% end %>
+    login_page.visit
     login_page.login(user['username'], password)
   end
 
@@ -28,7 +27,7 @@ describe 'Login' do
 
     it 'can successfully log in' do
       # binding.break  # Uncomment to pause here and inspect state
-      account_page.<% if capybara? -%>visit_page<% else -%>visit<% end %>
+      account_page.visit
       expect(header).to eq "Welcome back #{user['name']}"
     end
   end
@@ -37,12 +36,11 @@ describe 'Login' do
     let(:password) { 'wrongPassword' }
 
     it 'cannot log in' do
-      login_page.<% if capybara? -%>visit_page<% else -%>visit<% end %>
+      login_page.visit
       expect(header).to eq 'Login or register'
     end
   end
 end
-<%- end -%>
 <%- else -%>
 <% if cross_platform? -%>
 require_relative '../helpers/appium_helper'