ruby_raider 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02747aaf5daa92a26aec43eefd65d6e3a9d84b3b83a0c0b678174f7f93d3725a
-  data.tar.gz: 3b754cbe2bb76ade7f7c37f5d7cee232c08432a9b4a3bf148fc9ec046a379a39
+  metadata.gz: d8f98b7b75772a1d20015806b95e8194b357031dc4828181b0d3db2ed3bf9a65
+  data.tar.gz: 6ef9b9c02c12d85fc2da88706c92051fc19fd3da4788613038771b4ecbdbe5b6
 SHA512:
-  metadata.gz: 3831dcce4173d9612da9a8710401c0f532b61f5811c4ef4f3fa3215329fcdb5768a256e61c6de33bb666ffba3745b078119dcef7feeea6173e94f396a9280c4c
-  data.tar.gz: 0e56906c04bdbea1f0925e7bb91ba4d799ec91fa47550cec9ba540960c1d4512c5c2f57f25e3ddda9fc79bbd5c3273187ad27c41e8dde3a541ee1cda6fd43f37
+  metadata.gz: 85ab371da3692e9559efaff063b8403716c8f947b93d9504c65cd9ae7531c791c7545c82473661879b35a5896de664d103ca0d41cf526408a66dfc6e18d52700
+  data.tar.gz: 417edbb4b68ab62d0eba0d8c6eea8e60ef6df077f168d2d2fafb7019cc7a50b5528c086256b3d3a03c01ccf20abcc0e6018c572cd019c99c964bb5205c5ab4fe

data/lib/generators/automation/templates/account.tt

@@ -1,5 +1,5 @@
-<%- if automation == 'selenium' -%>
+<%- if selenium_based? -%>
 <%=- ERB.new(File.read(File.expand_path('./partials/selenium_account.tt', __dir__)), trim_mode: '-').result(binding) -%>
-<%- elsif automation == 'watir' -%>
+<%- elsif watir? -%>
 <%=- ERB.new(File.read(File.expand_path('./partials/watir_account.tt', __dir__)), trim_mode: '-').result(binding) -%>
 <%- end -%>

data/lib/generators/automation/templates/appium_caps.tt

@@ -1,6 +1,6 @@
-<% if automation.include?('ios') %>
+<% if ios? %>
 <%= ERB.new(File.read(File.expand_path('./partials/ios_caps.tt', __dir__))).result(binding) -%>
-<% elsif automation == 'android' %>
+<% elsif android? %>
 <%= ERB.new(File.read(File.expand_path('./partials/android_caps.tt', __dir__))).result(binding) -%>
 <% else %>
 <%= ERB.new(File.read(File.expand_path('./partials/cross_platform_caps.tt', __dir__))).result(binding) -%>

data/lib/generators/automation/templates/home.tt

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../abstract/page'
+
 class Home < Page
 
   # Actions
@@ -14,6 +15,6 @@ class Home < Page
   # Elements
 
   def backpack_image
-    <%= ERB.new(File.read(File.expand_path('./partials/home_page_selector.tt', __dir__)), trim_mode: '-').result(binding) %>
+    <%= ERB.new(File.read(File.expand_path('./partials/home_page_selector.tt', __dir__)), trim_mode: '-').result(binding) -%>
   end
-end
+end

data/lib/generators/automation/templates/login.tt

@@ -1,5 +1,5 @@
-<%- if automation == 'selenium' -%>
+<%- if selenium_based? -%>
 <%=- ERB.new(File.read(File.expand_path('./partials/selenium_login.tt', __dir__)), trim_mode: '-').result(binding) -%>
-<%- elsif automation == 'watir' -%>
+<%- elsif watir? -%>
 <%=- ERB.new(File.read(File.expand_path('./partials/watir_login.tt', __dir__)), trim_mode: '-').result(binding) -%>
 <%- end -%>

data/lib/generators/automation/templates/page.tt

@@ -3,7 +3,7 @@ require_relative '../components/header'
 <%- end -%>
 
 class Page
-<%- if automation == 'cross_platform' -%>
+<%- if cross_platform? -%>
   include AppiumHelper
 <%- end -%>
 <%=- ERB.new(File.read(File.expand_path('./partials/initialize_selector.tt', __dir__))).result(binding) -%>
@@ -14,17 +14,17 @@ class Page
     self.class.to_s.sub('Page', ' Page')
   end
 
-  <%- if automation == 'selenium'  -%>
+  <%- if selenium_based?  -%>
   # Components
 
   def header
     Header.new(driver.find_element(id: 'customer_menu_top'))
   end
-  <%- elsif automation == 'watir'  -%>
+  <%- elsif watir?  -%>
   # Components
 
   def header
     Header.new(browser.element(id: 'customer_menu_top'))
   end
   <%- end -%>
-end
+end

data/lib/generators/automation/templates/partials/element.tt

@@ -1,4 +1,4 @@
-<% if %w[selenium appium_ios appium_android].include?(automation) -%>
+<% if %w[selenium axe applitools appium_ios appium_android].include?(automation) -%>
   driver.find_element
 <% else -%>
   browser.element

data/lib/generators/automation/templates/partials/home_page_selector.tt

@@ -1,6 +1,6 @@
-<%- if automation == 'ios' -%>
+<%- if ios? -%>
 driver.find_element(predicate: 'label == "Sauce Labs Backpack"')
-<%- elsif automation == 'android' -%>
+<%- elsif android? -%>
 driver.find_element(xpath: '(//android.view.ViewGroup[@content-desc="store item"])[1]/android.view.ViewGroup[1]')
 <%- else -%>
 element(ios: { predicate: 'label == "Sauce Labs Backpack"' },

data/lib/generators/automation/templates/partials/initialize_selector.tt

@@ -1,4 +1,4 @@
-<% if automation == 'watir' %>
+<% if watir? %>
   attr_reader :browser
 
   def initialize(browser)

data/lib/generators/automation/templates/partials/pdp_page_selector.tt

@@ -1,6 +1,6 @@
-<%- if automation == 'ios' -%>
+<%- if ios? -%>
 driver.find_element(accessibility_id: 'Add To Cart button')
-<%- elsif automation == 'android' -%>
+<%- elsif android? -%>
 driver.find_element(xpath: '//android.view.ViewGroup[@content-desc="Add To Cart button"]/android.widget.TextView')
 <%- else -%>
 element(ios: { accessibility_id: 'Add To Cart button' },

data/lib/generators/automation/templates/partials/selenium_login.tt

@@ -31,4 +31,4 @@ class Login < Page
   def login_button
     driver.find_element(xpath: "//button[@title='Login']")
   end
-end
+end

data/lib/generators/automation/templates/partials/url_methods.tt

@@ -1,4 +1,4 @@
-<% if %w[selenium watir].include?(automation) %>
+<% if web? %>
   def full_url(*page)
     "#{base_url}#{url(*page)}"
   end

data/lib/generators/automation/templates/partials/visit_method.tt

@@ -1,5 +1,5 @@
-<% if %w[selenium watir].include? automation %>
+<% if web? %>
   def visit(*page)
-    <% if automation == 'selenium' %>@driver.navigate.to full_url(page.first) <% else %>@browser.goto full_url(page.first)<% end %>
+    <% if selenium_based? %>@driver.navigate.to full_url(page.first) <% else %>@browser.goto full_url(page.first)<% end %>
   end
 <% end %>

data/lib/generators/automation/templates/pdp.tt

@@ -1,4 +1,5 @@
 require_relative '../abstract/page'
+
 class Pdp < Page
 
   # Actions
@@ -12,6 +13,6 @@ class Pdp < Page
   # Elements
 
   def add_to_cart_button
-    <%= ERB.new(File.read(File.expand_path('./partials/pdp_page_selector.tt', __dir__)), trim_mode: '-').result(binding) %>
+    <%= ERB.new(File.read(File.expand_path('./partials/pdp_page_selector.tt', __dir__)), trim_mode: '-').result(binding) -%>
   end
-end
+end

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

@@ -1,8 +1,7 @@
-<%- case automation
- when 'selenium' -%>
-<%=- ERB.new(File.read(File.expand_path('./partials/selenium_env.tt', __dir__)), trim_mode: '-').result(binding) -%>
-<%- when 'watir' -%>
-<%=- ERB.new(File.read(File.expand_path('./partials/watir_env.tt', __dir__)), trim_mode: '-').result(binding) -%>
+<%- if selenium_based? -%>
+  <%= ERB.new(File.read(File.expand_path('./partials/selenium_env.tt', __dir__)), trim_mode: '-').result(binding) -%>
+<%- elsif mobile? -%>
+  <%= ERB.new(File.read(File.expand_path('./partials/appium_env.tt', __dir__)), trim_mode: '-').result(binding) -%>
 <%- else -%>
-<%=- ERB.new(File.read(File.expand_path('./partials/appium_env.tt', __dir__)), trim_mode: '-').result(binding) -%>
-<%- end -%>
+  <%= ERB.new(File.read(File.expand_path('./partials/watir_env.tt', __dir__)), trim_mode: '-').result(binding) -%>
+<%- end -%>

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

@@ -1,16 +1,20 @@
-<% if %w[selenium watir].include? automation -%>
+<%- if web? -%>
 Feature: Login Page
 
 Scenario: A user can login
     Given I'm a registered user on the login page
     When I login with my credentials
+<%- if axe? -%>
+    Then the page should be axe clean
+<%- else -%>
     Then I'm logged in
+<% end -%>
 
-<% else -%>
+<%- else -%>
 Feature: Home Page
 
 Scenario: A user can go to the product details page
     Given I'm an anonymous user on the home page
     When I select one of the products
     Then I'm redirected to the product details page
-<% end %>
+<%- end %>

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

@@ -1,8 +1,5 @@
 require 'tmpdir'
 require_relative '../../helpers/allure_helper'
-require_relative '../../helpers/driver_helper'
-
-include DriverHelper
 
 Before do
   AllureHelper.configure
@@ -15,4 +12,4 @@ After do |scenario|
     AllureHelper.add_screenshot(scenario.name, screenshot)
   end
   driver.quit_driver
-end
+end

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

@@ -1,11 +1,12 @@
 require_relative '../../helpers/driver_helper'
-<%- if visual_automation -%>
+<%- if visual? -%>
 require_relative '../../helpers/visual_helper'
 <%- end -%>
-<%- if automation == 'selenium' -%>
+<%- if selenium_based? -%>
 require_relative '../../models/user_factory'
 
-World(DriverHelper<%- if visual_automation -%>, VisualHelper<%- end -%>)
+World(DriverHelper<%- if visual? -%>, VisualHelper<%- end -%>)
 <%- else -%>
+
 World(DriverHelper)
 <%- end -%>

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

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-<% if automation == 'cross_platform' -%>
+<%- if cross_platform? -%>
 require_relative '../../helpers/appium_helper'
 <%- end -%>
 require_relative '../../page_objects/pages/home'
 require_relative '../../page_objects/pages/pdp'
 
 Given("I'm an anonymous user on the home page") do
-    @home_page = Home.new(driver)
+  @home_page = Home.new(driver)
 end
 
 When('I select one of the products') do
-    @home_page.go_to_backpack_pdp
+  @home_page.go_to_backpack_pdp
 end
 
-When("I'm redirected to the product details page") do
-    pdp_page = Pdp.new(driver)
-    expect(pdp_page.add_to_cart_text).to eq 'Add To Cart'
-end
+Then("I'm redirected to the product details page") do
+  pdp_page = Pdp.new(driver)
+  expect(pdp_page.add_to_cart_text).to eq 'Add To Cart'
+end

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

@@ -1,5 +1,5 @@
-<%- if visual_automation -%>
 # frozen_string_literal: true
+<%- if visual? -%>
 
 require 'tmpdir'
 require_relative '../../helpers/allure_helper'
@@ -30,14 +30,14 @@ After do |scenario|
 end
 
 <%- else -%>
-# frozen_string_literal: true
 
+<%- if axe? && cucumber? -%>
+require 'axe-rspec'
+<%- end -%>
+require 'rspec'
 require 'tmpdir'
-require_relative '../../helpers/driver_helper'
 require_relative '../../helpers/allure_helper'
 
-include DriverHelper
-
 Before do
   driver.manage.window.maximize
 end
@@ -49,4 +49,4 @@ After do |scenario|
   end
   driver.quit
 end
-<%- end -%>
+<%- end -%>

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

@@ -2,9 +2,6 @@
 
 require 'tmpdir'
 require_relative '../../helpers/allure_helper'
-require_relative '../../helpers/browser_helper'
-
-include BrowserHelper
 
 Before do
   browser.window.maximize
@@ -16,4 +13,4 @@ After do |scenario|
     AllureHelper.add_screenshot(scenario.name, screenshot)
   end
   browser.quit
-end
+end

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

@@ -5,7 +5,7 @@ require_relative '../../page_objects/pages/login'
 
 Given("I'm a {user} on the login page") do |user|
   @user = user
-  @login_page = Login.new(<% if automation == 'watir' %>browser<% else %>driver<% end %>)
+  @login_page = Login.new(<% if watir? %>browser<% else %>driver<% end %>)
   @login_page.visit
 end
 
@@ -13,11 +13,18 @@ When('I login with my credentials') do
   @login_page.login(@user['username'], @user['password'])
 end
 
+<%- if axe? -%>
+Then('the page should be axe clean') do
+  account = Account.new(driver)
+  expect(account.page).to be_axe_clean
+end
+<%- else -%>
 Then("I'm logged in") do
-  account_page = Account.new(<% if automation == 'watir' %>browser<% else %>driver<% end %>)
-  <%- if visual_automation == true -%>
+  account_page = Account.new(<% if watir? %>browser<% else %>driver<% end %>)
+  <%- if visual? -%>
   check_page account_page
   <%- else -%>
   expect(account_page.header.customer_name).to eq "Welcome back #{@user['name']}"
   <%- end -%>
 end
+<%- end -%>

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

@@ -1,5 +1,5 @@
-<% if %w[selenium watir].include? automation -%>
+<%- if web? -%>
 <%= ERB.new(File.read(File.expand_path('./partials/web_steps.tt', __dir__)), trim_mode: '-').result(binding).strip! -%>
-<% else -%>
+<%- else -%>
 <%= ERB.new(File.read(File.expand_path('./partials/mobile_steps.tt', __dir__)), trim_mode: '-').result(binding).strip! -%>
-<% end -%>
+<%- end -%>

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

@@ -1,4 +1,4 @@
-<%- if automation == 'watir' -%>
+<%- if watir? -%>
 <%=- ERB.new(File.read(File.expand_path('./partials/watir_world.tt', __dir__)), trim_mode: '-').result(binding).strip! -%>
 <%- else -%>
 <%=- ERB.new(File.read(File.expand_path('./partials/driver_world.tt', __dir__)), trim_mode: '-').result(binding).strip! -%>

data/lib/generators/generator.rb

@@ -8,8 +8,6 @@ class Generator < Thor::Group
   argument :automation
   argument :framework
   argument :name
-  argument :visual_automation, optional: true
-  argument :axe_support, optional: true
 
   def self.source_paths
     base_path = File.dirname(__FILE__)
@@ -38,6 +36,14 @@ class Generator < Thor::Group
     (args & %w[android ios]).count.positive?
   end
 
+  def ios?
+    args.include?('ios')
+  end
+
+  def android?
+    args.include?('android')
+  end
+
   def rspec?
     args.include?('rspec')
   end
@@ -47,7 +53,7 @@ class Generator < Thor::Group
   end
 
   def visual?
-    args[3]
+    args.include?('applitools')
   end
 
   def watir?
@@ -55,11 +61,15 @@ class Generator < Thor::Group
   end
 
   def web?
-    (args & (%w[selenium watir])).count.positive?
+    (args & (%w[selenium watir axe applitools])).count.positive?
   end
 
   def axe?
-    args.last
+    args.include?('axe')
+  end
+
+  def selenium_based?
+    (args & %w[selenium axe applitools]).count.positive?
   end
 
   private

data/lib/generators/helper_generator.rb

@@ -24,7 +24,7 @@ class HelpersGenerator < Generator
   end
 
   def generate_browser_helper
-    return if selenium? || mobile?
+    return if selenium_based? || mobile?
 
     template('helpers/browser_helper.tt', "#{name}/helpers/browser_helper.rb")
   end

data/lib/generators/invoke_generators.rb

@@ -19,9 +19,7 @@ module InvokeGenerators
                          automation: structure[:automation],
                          framework:,
                          generator:,
-                         name: structure[:name],
-                         visual: to_bool(structure[:visual]),
-                         axe_support: to_bool(structure[:axe_support])
+                         name: structure[:name]
                        })
     end
   end
@@ -34,9 +32,7 @@ module InvokeGenerators
     Object.const_get("#{structure[:generator]}Generator")
           .new([structure[:automation],
                 structure[:framework],
-                structure[:name],
-                structure[:visual],
-                structure[:axe_support]]).invoke_all
+                structure[:name]]).invoke_all
   end
 
   def to_bool(string)

data/lib/generators/menu_generator.rb

@@ -21,14 +21,6 @@ class MenuGenerator
     end
   end
 
-  def choose_visual_automation
-    prompt.select('Do you want to add visual automation with Applitools?', yes_no_menu_choices)
-  end
-
-  def choose_axe_support
-    prompt.select('Do you want to add Axe accessibility testing tool?', yes_no_menu_choices)
-  end
-
   def choose_test_framework(automation)
     return choose_mobile_platform if automation == 'appium'
 
@@ -39,9 +31,7 @@ class MenuGenerator
     structure = {
       automation: options[:automation],
       framework: options[:framework],
-      name: @name,
-      visual: options[:visual_automation],
-      axe_support: options[:axe_support]
+      name: @name
     }
     generate_framework(structure)
     system "cd #{name} && gem install bundler && bundle install"
@@ -66,26 +56,20 @@ class MenuGenerator
     end
   end
 
-  FrameworkOptions = Struct.new(:automation, :framework, :visual_automation, :axe_support)
+  FrameworkOptions = Struct.new(:automation, :framework)
 
   def create_framework_options(params)
-    FrameworkOptions.new(params[:automation], params[:framework], params[:visual_automation], params[:axe_support])
+    FrameworkOptions.new(params[:automation], params[:framework])
   end
 
   def create_framework(framework, automation_type)
-    visual_automation = choose_visual_automation if %w[selenium].include?(automation_type)
-    axe = choose_axe_support if automation_type == 'selenium' && framework == 'Rspec' && visual_automation == false
     options = create_framework_options(automation: automation_type,
-                                       framework: framework.downcase,
-                                       visual_automation:,
-                                       axe_support: axe)
+                                       framework: framework.downcase)
 
     # Print the chosen options
     puts 'Chosen Options:'
     puts "  Automation Type: #{options[:automation]}"
     puts "  Framework: #{options[:framework]}"
-    puts "  Visual Automation: #{options[:visual_automation]}"
-    puts "  Axe Support: #{options[:axe_support]}"
 
     set_up_framework(options)
     prompt.say("You have chosen to use #{framework} with #{automation_type}")
@@ -100,9 +84,11 @@ class MenuGenerator
   end
 
   def select_automation_framework(menu)
-    menu.choice :Appium, -> { choose_test_framework('appium') }
     menu.choice :Selenium, -> { choose_test_framework('selenium') }
+    menu.choice :Appium, -> { choose_test_framework('appium') }
     menu.choice :Watir, -> { choose_test_framework('watir') }
+    menu.choice :Applitools, -> { choose_test_framework('applitools') }
+    menu.choice :Axe, -> { choose_test_framework('axe') }
     menu.choice :Quit, -> { exit }
   end
 end

data/lib/generators/rspec/rspec_generator.rb

@@ -4,7 +4,7 @@ require_relative '../generator'
 
 class RspecGenerator < Generator
   def generate_login_spec
-    return unless web?
+    return unless web? && !visual?
 
     template('spec.tt', "#{name}/spec/login_page_spec.rb")
   end

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

@@ -1,4 +1,4 @@
-<%- if %w[selenium watir].include? automation -%>
+<%- if selenium_based? || watir? -%>
 # frozen_string_literal: true
 
 require_relative '../helpers/spec_helper'
@@ -33,13 +33,13 @@ describe 'Login' do
     end
   end
 end
-<%- elsif %w[selenium watir].include? automation -%>
+<%- elsif selenium_based? || watir? -%>
 describe 'Login' do
   subject(:header) { account_page.header.customer_name }
 
   let(:user) { ModelFactory.for('users')['registered user'] }
-  let(:login_page) { Login.new(<% if automation == 'watir' -%>browser<% else -%>driver<% end -%>) }
-  let(:account_page) { Account.new(<% if automation == 'watir' -%>browser<% else -%>driver<% end -%>) }
+  let(:login_page) { Login.new(<% if watir? -%>browser<% else -%>driver<% end -%>) }
+  let(:account_page) { Account.new(<% if watir? -%>browser<% else -%>driver<% end -%>) }
 
   before do
     login_page.visit
@@ -50,7 +50,7 @@ describe 'Login' do
     let(:password) { user['password'] }
 
     it 'can successfully log in' do
-    <%- if visual_automation == true -%>
+    <%- if visual? -%>
       check_page account_page
     <%- else -%>
       expect(header).to eq "Welcome back #{user['name']}"
@@ -62,7 +62,7 @@ describe 'Login' do
     let(:password) { 'wrongPassword' }
 
     it 'cannot log in' do
-    <%- if visual_automation == true -%>
+    <%- if visual? -%>
       check_page login_page
     <%- else -%>
       expect(header).to eq 'Login or register'
@@ -72,7 +72,7 @@ describe 'Login' do
 end
 <%- end -%>
 <%- else -%>
-<% if automation == 'cross_platform' -%>
+<% if cross_platform? -%>
 require_relative '../helpers/appium_helper'
 <%- end -%>
 require_relative '../helpers/spec_helper'

data/lib/generators/templates/common/config.tt

@@ -1,4 +1,4 @@
-<% if %w[ios android cross_platform].include?(automation) -%>
+<% if mobile? -%>
 <%= ERB.new(File.read(File.expand_path('./partials/mobile_config.tt', __dir__))).result(binding) %>
 <% else -%>
 <%= ERB.new(File.read(File.expand_path('./partials/web_config.tt', __dir__)), trim_mode: '-').result(binding) %>

data/lib/generators/templates/common/gemfile.tt

@@ -1,33 +1,33 @@
 source 'https://rubygems.org'
 
 gem 'activesupport'
-<% if framework == 'cucumber' -%>
+<%- if cucumber? -%>
 gem 'allure-cucumber'
-<% else -%>
+<%- else -%>
 gem 'allure-rspec'
 gem 'allure-ruby-commons'
-<% end -%>
-<% if axe? -%>
+<%- end -%>
+<%- if axe? -%>
 gem 'axe-core-rspec'
 gem 'axe-core-selenium'
-<% end -%>
-<% if visual_automation -%>
+<%- end -%>
+<%- if visual? -%>
 gem 'eyes_selenium', '~> 4.6', '>= 4.6.1'
 gem 'eyes_universal', '~> 3.3', '>= 3.3.1'
-<% end -%>
-<% unless visual_automation -%>
+<%- end -%>
+<%- unless visual? -%>
 gem 'parallel_split_test'
 gem 'parallel_tests'
-<% end -%>
+<%- end -%>
 gem 'rake'
 gem 'reek'
 gem '<%= framework %>'
-<% if framework == 'cucumber' -%>
+<%- if cucumber? -%>
 gem 'rspec'
-<% end -%>
+<%- end -%>
 gem 'rubocop'
-<% if framework == 'rspec' -%>
+<%- if rspec? -%>
 gem 'rubocop-rspec'
-<% end -%>
+<%- end -%>
 gem 'ruby_raider', '~> 0.9.0'
 <%= ERB.new(File.read(File.expand_path('./partials/automation_gems.tt', __dir__))).result(binding).strip! %>

data/lib/generators/templates/common/partials/automation_gems.tt

@@ -2,7 +2,7 @@
  when 'watir' %>
 gem 'selenium-webdriver'
 gem 'watir'
-<% when 'selenium' %>
+<% when selenium_based? %>
 gem 'selenium-webdriver'
 <% else %>
 gem 'appium_lib'

data/lib/generators/templates/common/partials/web_config.tt

@@ -1,7 +1,7 @@
 browser: :chrome
 url: 'https://automationteststore.com/'
 
-<%- if automation == 'selenium' -%>
+<%- if selenium_based? -%>
 driver_options:
   :timeouts:
     :implicit: 10000 # 10 seconds

data/lib/generators/templates/common/rubocop.tt

@@ -1,4 +1,4 @@
-<% if framework == 'rspec' -%>
+<% if rspec? -%>
 require:
   - rubocop-rspec
 <% end -%>

data/lib/generators/templates/helpers/allure_helper.tt

@@ -21,11 +21,11 @@ module AllureHelper
         test_case: true
        )
      end
+  <%- if rspec? -%>
 
-  <%- if framework == 'rspec' -%>
     def formatter
       AllureRspecFormatter
     end
-      <%- end -%>
+  <%- end -%>
   end
 end

data/lib/generators/templates/helpers/driver_helper.tt

@@ -3,24 +3,26 @@
 require 'axe-selenium'
 <% end -%>
 require 'yaml'
-<% if automation == 'selenium' -%>
+<%- unless axe? %>
+<%- if selenium_based? -%>
 require 'active_support/inflector'
 require 'selenium-webdriver'
-<% else -%>
+<%- else -%>
 require 'appium_lib'
-<% end -%>
+<%- end -%>
+<%- end -%>
 
 module DriverHelper
-  <% if automation == 'selenium' && axe? == false -%>
+  <%- if selenium_based? && !axe? -%>
   def driver(*opts)
     @driver ||= create_driver(*opts)
   end
-  <% elsif axe? == true -%>
+  <%- elsif axe? -%>
   def driver(browser = :chrome, js_path = nil, skip_iframes = nil)
     @driver ||= create_driver(browser, js_path, skip_iframes)
   end
-  <% else -%>
-def driver
+  <%- else -%>
+  def driver
     @driver ||= create_driver
   end
   <%- end -%>
@@ -28,4 +30,4 @@ def driver
   private
 
   <%= ERB.new(File.read(File.expand_path('./partials/driver_and_options.tt', __dir__)), trim_mode: '-').result(binding).strip! %>
-end
+end

data/lib/generators/templates/helpers/partials/allure_imports.tt

@@ -1,4 +1,4 @@
-<% if framework == 'rspec' %>
+<% if rspec? %>
 AllureRspec
 <% else %>
 AllureCucumber

data/lib/generators/templates/helpers/partials/allure_requirements.tt

@@ -1,4 +1,4 @@
-<% if framework == 'cucumber' %>
+<% if cucumber? %>
 require 'allure-cucumber'
 <% else %>
 require 'allure-ruby-commons'

data/lib/generators/templates/helpers/partials/driver_and_options.tt

@@ -1,11 +1,11 @@
-<% if automation == 'selenium' && axe? == true -%>
+<% if axe? -%>
   def create_driver(browser, js_path, skip_iframes)
     AxeSelenium.configure(browser) do |config|
       config.jslib_path = js_path if js_path
       config.skip_iframes = skip_iframes if skip_iframes
     end.page
   end
-<% elsif automation == 'selenium' -%>
+<% elsif selenium_based? -%>
   def create_driver(*opts)
     @config = YAML.load_file('config/config.yml')
     browser = @config['browser'].to_sym
@@ -29,7 +29,7 @@
     driver_options.each { |opt| options.add_option(opt.first, opt.last) }
     options
   end
-<% elsif automation == 'cross_platform' -%>
+<% elsif cross_platform? -%>
   def create_driver
     @driver = Appium::Driver.new({ caps: parsed_caps })
   end

data/lib/generators/templates/helpers/partials/quit_driver.tt

@@ -1,8 +1,7 @@
-<% case automation
- when 'selenium' %>
-driver.quit
-<% when 'watir' %>
-browser.quit
+<% if selenium_based? %>
+  driver.quit
+<% elsif watir? %>
+  browser.quit
 <% else %>
-driver.quit_driver
+  driver.quit_driver
 <% end %>

data/lib/generators/templates/helpers/partials/screenshot.tt

@@ -1,8 +1,7 @@
-<% case automation
- when 'selenium' %>
-screenshot = driver.save_screenshot("#{temp_folder}/#{example_name}.png")
-<% when 'watir' %>
-screenshot = browser.screenshot.save("#{temp_folder}/#{example_name}.png")
+<% if selenium_based? %>
+  screenshot = driver.save_screenshot("#{temp_folder}/#{example_name}.png")
+<% elsif watir? %>
+  screenshot = browser.screenshot.save("#{temp_folder}/#{example_name}.png")
 <% else %>
-screenshot = driver.screenshot("#{temp_folder}/#{example_name}.png")
-<% end %>
+  screenshot = driver.screenshot("#{temp_folder}/#{example_name}.png")
+<% end %>

data/lib/generators/templates/helpers/spec_helper.tt

@@ -6,7 +6,7 @@ require 'axe-rspec'
 require 'rspec'
 require 'tmpdir'
 require_relative 'allure_helper'
-<%- if automation == 'watir' -%>
+<%- if watir? -%>
 require_relative 'browser_helper'
 <%- else -%>
 require_relative 'driver_helper'
@@ -17,16 +17,16 @@ module SpecHelper
   AllureHelper.configure
   RSpec.configure do |config|
     config.formatter = AllureHelper.formatter
-    <% if automation == 'watir' %>config.include(BrowserHelper)<% else %>config.include(DriverHelper)<% end %>
-    <%- if %w[android ios cross_platform].include? automation -%>
+    <% if watir? %>config.include(BrowserHelper)<% else %>config.include(DriverHelper)<% end %>
+    <%- if mobile? -%>
     config.before(:each) do
       driver.start_driver
     end
-    <%- elsif automation == 'selenium' -%>
+    <%- elsif selenium_based? -%>
     config.before(:each) do
       driver.manage.window.maximize
     end
-    <%- elsif automation == 'watir' -%>
+    <%- elsif watir? -%>
     config.before(:each) do
       browser.window.maximize
     end

data/lib/version

@@ -1 +1 @@
-0.9.3
+0.9.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_raider
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Agustin Pequeno
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-20 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake