ruby_raider 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb170c4c6622158ba4088d25feebd10507348502651317c347c12700a548dbb6
-  data.tar.gz: ea3cc03c9fb1be421f8e984af79a4d91c42f98882e002047f1d55cda8252f2eb
+  metadata.gz: 8710aab0ae8636ca5829f35c5a5d5076002b02caf918284b161816eeda0b6dca
+  data.tar.gz: b69e53e10c6bfa0a8132e8975b8ce54cd412bfde5b88d465d244d9241005b4c0
 SHA512:
-  metadata.gz: 4342e7ae85754d140bf5831cedf1e2403154ff5be7805ff06c346bc68ba91d0c63f6e1ee4a904ab6b2bbc31b32b3676f4cdaa58b0a69515fe6013f1708d7e628
-  data.tar.gz: 4c44dd2157bfbe3d38cf0e353a9a78639ef98c2baaa8469f2d10ec756dc313bc4c98fed5a5ccc23bef8e583c6faf8da3a66f52b049efba5f9d5ee25abee837ea
+  metadata.gz: 8bc42e8cc009974f4793e47ed2a9eba9afd651fe1309f91a247d587a63618d3302e3ee68bcaaf71378446edd30f5e6b35582ee38c55407e34973f0a1e8fa5538
+  data.tar.gz: b189d100a0a4c47dcb6be4d58e7ff17e47ffb91c031a820db0d9f84f0a5368a3974d3cb2f846c0286cc6e6405a5cad851f3e44c79f637b41fbfc6b0bfbbaf993

data/README.md

@@ -54,7 +54,7 @@ Ruby Raider is a generator and scaffolding gem to make UI test automation easier
 
 * Generating a visual testing framework with Rspec, Applitools and Selenium
 
-* Generating a visual testing framework with Rspec, Applitools and Watir
+* Generating a visual testing framework with Cucumber, Applitools and Selenium
 
 ***In order to run the Appium tests, download the example [app](https://github.com/saucelabs/my-demo-app-rn).***
 

data/lib/generators/automation/automation_examples_generator.rb

@@ -4,7 +4,7 @@ require_relative '../generator'
 
 class AutomationExamplesGenerator < Generator
   def generate_example_files
-    if mobile_platform?
+    if mobile?
       generate_home_page
       generate_pdp_page
     else
@@ -12,6 +12,7 @@ class AutomationExamplesGenerator < Generator
       generate_model_data
       generate_header_component
       generate_login_page
+      generate_account_page
     end
   end
 
@@ -21,6 +22,10 @@ class AutomationExamplesGenerator < Generator
     template('login_page.tt', "#{name}/page_objects/pages/login_page.rb")
   end
 
+  def generate_account_page
+    template('account_page.tt', "#{name}/page_objects/pages/account_page.rb")
+  end
+
   def generate_home_page
     template('home_page.tt', "#{name}/page_objects/pages/home_page.rb")
   end

data/lib/generators/automation/automation_generator.rb

@@ -3,24 +3,33 @@
 require_relative '../generator'
 
 class AutomationGenerator < Generator
+  def generate_automation_files
+    if mobile?
+      generate_appium_settings
+    else
+      generate_abstract_component
+      generate_visual_options
+    end
+
+    generate_abstract_page
+  end
+
+  private
+
   def generate_abstract_page
     template('abstract_page.tt', "#{name}/page_objects/abstract/abstract_page.rb")
   end
 
   def generate_abstract_component
-    return if mobile_platform?
-
     template('abstract_component.tt', "#{name}/page_objects/abstract/abstract_component.rb")
   end
 
   def generate_appium_settings
-    return unless mobile_platform?
-
     template('appium_caps.tt', "#{name}/config/capabilities.yml")
   end
 
   def generate_visual_options
-    return unless visual_selected?
+    return unless visual?
 
     template('visual_options.tt', "#{name}/config/options.yml")
   end

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

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

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

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

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative '../abstract/abstract_page'
+require_relative '../components/header_component'
+
+class AccountPage < AbstractPage
+
+  def url(_page)
+    'index.php?rt=account/account'
+  end
+
+  # Components
+
+  def header
+    HeaderComponent.new(driver.find_element(class: 'menu_text'))
+  end
+end

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

@@ -0,0 +1,15 @@
+require_relative '../abstract/abstract_page'
+require_relative '../components/header_component'
+
+class AccountPage < AbstractPage
+
+  def url(_page)
+    'index.php?rt=account/account'
+  end
+
+  # Components
+
+  def header
+    HeaderComponent.new(browser.element(class: 'menu_text'))
+  end
+end

data/lib/generators/common_generator.rb

@@ -8,7 +8,7 @@ class CommonGenerator < Generator
   end
 
   def generate_config_file
-    return if mobile_platform?
+    return if mobile?
 
     template('common/config.tt', "#{name}/config/config.yml")
   end
@@ -30,10 +30,10 @@ class CommonGenerator < Generator
   end
 
   def create_allure_folder
-    empty_directory "#{name}/allure-results" unless visual_selected?
+    empty_directory "#{name}/allure-results"
   end
 
   def create_screenshots_folder
-    empty_directory "#{name}/allure-results/screenshots" unless visual_selected?
+    empty_directory "#{name}/allure-results/screenshots"
   end
 end

data/lib/generators/cucumber/cucumber_generator.rb

@@ -8,7 +8,7 @@ class CucumberGenerator < Generator
   end
 
   def generate_world
-    template('world.tt', "#{name}/world.rb")
+    template('world.tt', "#{name}/features/support/world.rb")
   end
 
   def generate_cucumber_file

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

@@ -1,8 +1,8 @@
-<% case automation
+<%- case automation
  when 'selenium' -%>
-<%= ERB.new(File.read(File.expand_path('./partials/selenium_appium_env.tt', __dir__))).result(binding) %>
-<% when 'watir' -%>
-<%= ERB.new(File.read(File.expand_path('./partials/watir_env.tt', __dir__))).result(binding) %>
-<% else -%>
-<%= ERB.new(File.read(File.expand_path('./partials/appium_env.tt', __dir__))).result(binding) %>
-<% end -%>
+<%=- 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) -%>
+<%- else -%>
+<%=- ERB.new(File.read(File.expand_path('./partials/appium_env.tt', __dir__)), trim_mode: '-').result(binding) -%>
+<%- end -%>

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

@@ -4,7 +4,7 @@ Feature: Login Page
 Scenario: A user can login
     Given I'm a registered user on the login page
     When I login with my credentials
-    Then I can see the main page
+    Then I'm logged in
 
 <% else -%>
 Feature: Home Page

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

@@ -1,7 +1,11 @@
-<% if automation == 'selenium' %>
-require_relative 'models/user_factory'
+require_relative '../../helpers/driver_helper'
+<%- if visual_automation -%>
+require_relative '../../helpers/visual_helper'
+<%- end -%>
+<%- if automation == 'selenium' -%>
+require_relative '../../models/user_factory'
 
-World(DriverHelper, UserFactory)
-<% else %>
-World(DriverHelper)
-<% end %>
+World(Raider::DriverHelper<%- if visual_automation -%>, Raider::VisualHelper<%- end -%>)
+<%- else -%>
+World(Raider::DriverHelper)
+<%- end -%>

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

@@ -0,0 +1,44 @@
+<%- if visual_automation -%>
+# frozen_string_literal: true
+
+require_relative '../../helpers/driver_helper'
+require_relative '../../helpers/visual_helper'
+
+include Raider::DriverHelper
+include Raider::VisualHelper
+
+Before do
+  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+  @grid_runner = create_grid_runner
+  @eyes = create_eyes(@grid_runner)
+  configure_eyes @eyes
+  @driver = @eyes.open(driver: new_driver)
+end
+
+After do |scenario|
+  driver.save_screenshot("allure-results/screenshots/#{scenario.name}.png")
+  Raider::AllureHelper.add_screenshot(scenario.name)
+  @eyes.close
+  @driver.quit
+  @eyes.abort_async
+  results = @grid_runner.get_all_test_results
+  puts results
+end
+
+<%- else -%>
+# frozen_string_literal: true
+
+require_relative '../../helpers/driver_helper'
+
+include Raider::DriverHelper
+
+Before do
+  new_driver
+end
+
+After do |scenario|
+  driver.save_screenshot("allure-results/screenshots/#{scenario.name}.png")
+  Raider::AllureHelper.add_screenshot(scenario.name)
+  driver.quit
+end
+<%- end -%>

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

@@ -1,3 +1,33 @@
+<%- if visual_automation -%>
+# frozen_string_literal: true
+
+require_relative '../../helpers/browser_helper'
+require_relative '../../helpers/visual_helper'
+
+include Raider::BrowserHelper
+include Raider::VisualHelper
+
+Before do
+  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+  @grid_runner = create_grid_runner
+  @eyes = create_eyes(@grid_runner)
+  configure_eyes @eyes
+  @browser = @eyes.open(driver: new_browser.driver)
+end
+
+After do |scenario|
+  browser.screenshot.save("allure-results/screenshots/#{scenario.name}.png")
+  Raider::AllureHelper.add_screenshot(scenario.name)
+  @eyes.close
+  @browser.quit
+  @eyes.abort_async
+  results = @grid_runner.get_all_test_results
+  puts results
+end
+
+<%- else -%>
+# frozen_string_literal: true
+
 require_relative '../../helpers/browser_helper'
 
 include Raider::BrowserHelper
@@ -10,4 +40,5 @@ After do |scenario|
   browser.screenshot.save("allure-results/screenshots/#{scenario.name}.png")
   Raider::AllureHelper.add_screenshot(scenario.name)
   browser.quit
-end
+end
+<%- end -%>

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

@@ -1,3 +1,4 @@
-require_relative 'models/user_factory'
+require_relative '../../helpers/browser_helper'
+require_relative '../../models/user_factory'
 
-World(BrowserHelper, UserFactory)
+World(Raider::BrowserHelper)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../../page_objects/pages/account_page'
 require_relative '../../page_objects/pages/login_page'
-require_relative '../../models/user_factory'
 
 Given("I'm a {user} on the login page") do |user|
   @user = user
@@ -13,6 +13,11 @@ When('I login with my credentials') do
   @login_page.login(@user['username'], @user['password'])
 end
 
-When('I can see the main page') do
-  expect(@login_page.header.customer_name).to eq "Welcome back #{@user['name']}"
+Then("I'm logged in") do
+  account_page = AccountPage.new(<% if automation == 'watir' %>browser<% else %>driver<% end %>)
+  <%- if visual_automation == true -%>
+  check_page account_page
+  <%- else -%>
+  expect(account_page.header.customer_name).to eq "Welcome back #{@user['name']}"
+  <%- end -%>
 end

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

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

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

@@ -1,5 +1,5 @@
-<% if automation == 'watir' %>
-<%= ERB.new(File.read(File.expand_path('./partials/watir_world.tt', __dir__))).result(binding).strip! %>
-<% else %>
-<%= ERB.new(File.read(File.expand_path('./partials/driver_world.tt', __dir__))).result(binding).strip! %>
-<% end %>
+<%- if automation == '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! -%>
+<%- end -%>

data/lib/generators/generator.rb

@@ -19,15 +19,36 @@ class Generator < Thor::Group
     initializer.first
   end
 
-  def visual_selected?
-    initializer.first.last
+  def cucumber?
+    args.include?('cucumber')
+  end
+
+  # The framework is cross platform when it supports Android and iOS
+  def cross_platform?
+    args.include?('cross_platform')
   end
 
-  def mobile_platform?
+  def mobile?
     (args & %w[android ios cross_platform]).count.positive?
   end
 
-  def web_platform?
+  def rspec?
+    args.include?('rspec')
+  end
+
+  def selenium?
+    args.include?('selenium')
+  end
+
+  def visual?
+    initializer.first.last
+  end
+
+  def watir?
+    args.include?('watir')
+  end
+
+  def web?
     args.include?(%w[selenium watir])
   end
 

data/lib/generators/helper_generator.rb

@@ -8,12 +8,12 @@ class HelpersGenerator < Generator
     generate_browser_helper
     generate_driver_helper
     generate_appium_helper
+    generate_allure_helper
 
-    if visual_selected?
+    if visual?
       generate_visual_helper
       generate_visual_spec_helper
     else
-      generate_allure_helper
       generate_spec_helper
     end
   end
@@ -29,21 +29,25 @@ class HelpersGenerator < Generator
   end
 
   def generate_browser_helper
-    template('helpers/browser_helper.tt', "#{name}/helpers/browser_helper.rb") if args.include?('watir')
+    return if selenium?
+
+    template('helpers/browser_helper.tt', "#{name}/helpers/browser_helper.rb")
   end
 
   def generate_spec_helper
-    template('helpers/spec_helper.tt', "#{name}/helpers/spec_helper.rb") if args.include?('rspec')
+    return if cucumber?
+
+    template('helpers/spec_helper.tt', "#{name}/helpers/spec_helper.rb")
   end
 
   def generate_driver_helper
-    return if args.include?('watir')
+    return if watir?
 
     template('helpers/driver_helper.tt', "#{name}/helpers/driver_helper.rb")
   end
 
   def generate_appium_helper
-    return unless args.include?('cross_platform')
+    return unless cross_platform?
 
     template('helpers/appium_helper.tt', "#{name}/helpers/appium_helper.rb")
   end
@@ -53,6 +57,8 @@ class HelpersGenerator < Generator
   end
 
   def generate_visual_spec_helper
+    return if cucumber?
+
     template('helpers/visual_spec_helper.tt', "#{name}/helpers/spec_helper.rb")
   end
 end

data/lib/generators/menu_generator.rb

@@ -80,14 +80,14 @@ class MenuGenerator
   end
 
   def framework_with_examples(framework, automation_type)
-    visual_automation = choose_visual_automation if %w[selenium watir].include?(automation_type) && framework == 'Rspec'
+    visual_automation = choose_visual_automation if %w[selenium].include?(automation_type)
     options = create_framework_options(automation: automation_type, framework: framework.downcase, visual_automation: visual_automation, with_examples: true)
     set_up_framework(options)
     prompt.say("You have chosen to use #{framework} with #{automation_type}")
   end
 
   def framework_without_examples(framework, automation_type)
-    visual_automation = choose_visual_automation if %w[selenium watir].include?(automation_type) && framework == 'Rspec'
+    visual_automation = choose_visual_automation if %w[selenium].include?(automation_type)
     options = create_framework_options(automation: automation_type, framework: framework.downcase, visual_automation: visual_automation, with_examples: false)
     set_up_framework(options)
     prompt.say("You have chosen to use #{framework} with #{automation_type}")

data/lib/generators/rspec/rspec_examples_generator.rb

@@ -4,13 +4,13 @@ require_relative '../generator'
 
 class RspecExamplesGenerator < Generator
   def generate_login_spec
-    return if mobile_platform?
+    return if mobile?
 
     template('spec.tt', "#{name}/spec/login_page_spec.rb")
   end
 
   def generate_pdp_spec
-    return unless mobile_platform?
+    return unless mobile?
 
     template('spec.tt', "#{name}/spec/pdp_page_spec.rb")
   end

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

@@ -1,40 +1,17 @@
-<% if %w[selenium watir].include?(automation) && visual_automation == true %>
+<%- if %w[selenium watir].include? automation -%>
 # frozen_string_literal: true
 
 require_relative 'base_spec'
 require_relative '../models/model_factory'
+require_relative '../page_objects/pages/account_page'
 require_relative '../page_objects/pages/login_page'
 
 describe 'Login' do
-  subject(:header) { login_page.header.customer_name }
-
-  let(:user) { ModelFactory.for('users')['registered user'] }
-  let(:login_page) { LoginPage.new(<% if automation == 'watir' -%>browser<% else -%>driver<% end -%>) }
-
-  before do
-    login_page.visit
-  end
-
-  context 'with right credentials' do
-    let(:password) { user['password'] }
-
-    it 'cannot see unexpected changes on the login page' do
-      check_page login_page
-    end
-  end
-end
-<%- elsif %w[selenium watir].include? automation -%>
-# frozen_string_literal: true
-
-require_relative 'base_spec'
-require_relative '../models/model_factory'
-require_relative '../page_objects/pages/login_page'
-
-describe 'Login' do
-  subject(:header) { login_page.header.customer_name }
+  subject(:header) { account_page.header.customer_name }
 
   let(:user) { ModelFactory.for('users')['registered user'] }
   let(:login_page) { LoginPage.new(<% if automation == 'watir' -%>browser<% else -%>driver<% end -%>) }
+  let(:account_page) { AccountPage.new(<% if automation == 'watir' -%>browser<% else -%>driver<% end -%>) }
 
   before do
     login_page.visit
@@ -45,15 +22,23 @@ describe 'Login' do
     let(:password) { user['password'] }
 
     it 'can successfully log in' do
+    <%- if visual_automation == true -%>
+      check_page account_page
+    <%- else -%>
       expect(header).to eq "Welcome back #{user['name']}"
+    <%- end -%>
     end
   end
 
   context 'with wrong credentials' do
     let(:password) { 'wrongPassword' }
 
-    it 'cannot login in' do
+    it 'cannot log in' do
+    <%- if visual_automation == true -%>
+      check_page login_page
+    <%- else -%>
       expect(header).to be_empty
+    <%- end -%>
     end
   end
 end

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

@@ -1,12 +1,11 @@
 source 'https://rubygems.org'
 
 gem 'activesupport'
-<% unless visual_automation -%>
-gem 'allure-rspec'
-gem 'allure-ruby-commons'
-<% end -%>
 <% if framework == 'cucumber' -%>
 gem 'allure-cucumber'
+<% else -%>
+gem 'allure-rspec'
+gem 'allure-ruby-commons'
 <% end -%>
 <% if visual_automation -%>
 gem 'eyes_selenium', '~> 4.6', '>= 4.6.1'

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

@@ -50,7 +50,7 @@ Ruby Raider is a generator and scaffolding gem to make UI test automation easier
 
 * Generating a visual testing framework with Rspec, Applitools and Selenium
 
-* Generating a visual testing framework with Rspec, Applitools and Watir
+* Generating a visual testing framework with Cucumber, Applitools and Selenium
 
 ***In order to run the Appium tests, download the example [app](https://github.com/saucelabs/my-demo-app-rn).***
 

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-<%= ERB.new(File.read(File.expand_path('./partials/allure_requirements.tt', __dir__))).result(binding).strip! -%>
-<% allure = ERB.new(File.read(File.expand_path('./partials/allure_imports.tt', __dir__))).result(binding).strip! %>
+<%=- ERB.new(File.read(File.expand_path('./partials/allure_requirements.tt', __dir__))).result(binding).strip! -%>
+<%- allure = ERB.new(File.read(File.expand_path('./partials/allure_imports.tt', __dir__))).result(binding).strip! -%>
+
 
 module Raider
   module AllureHelper
@@ -22,11 +23,11 @@ module Raider
         )
       end
 
-    <% if framework == 'rspec' %>
+    <%- if framework == 'rspec' -%>
       def formatter
         AllureRspecFormatter
       end
-      <% end %>
+      <%- end -%>
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Raider
   module DriverHelper
     attr_reader :driver
 
- <%= ERB.new(File.read(File.expand_path('./partials/driver_and_options.tt', __dir__)), trim_mode: '-').result(binding).strip! %>
+    <%= ERB.new(File.read(File.expand_path('./partials/driver_and_options.tt', __dir__)), trim_mode: '-').result(binding).strip! %>
 
   <% if automation == 'cross_platform' -%>
   private
@@ -20,11 +20,11 @@ module Raider
       YAML.load_file('config/config.yml')
     end
 <% end -%>
-<% if automation != 'selenium'  -%>
+<%- if automation != 'selenium'  -%>
     # :reek:UtilityFunction
     def caps
       YAML.load_file('config/capabilities.yml')
     end
-<% end -%>
-  end
+<%- end -%>
+end
 end

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

@@ -1,5 +1,5 @@
 <% if automation == 'selenium' -%>
-      def new_driver(*opts)
+    def new_driver(*opts)
       @config = YAML.load_file('config/config.yml')
       browser = @config['browser'].to_sym
       @driver = Selenium::WebDriver.for(browser, capabilities: browser_options(*opts))

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

@@ -1,8 +1,5 @@
-<% case automation
- when 'selenium' %>
+<%- if automation == 'selenium' -%>
 driver.save_screenshot("allure-results/screenshots/#{example_name}.png")
-<% when 'watir' %>
+<%- else -%>
 browser.screenshot.save("allure-results/screenshots/#{example_name}.png")
-<% else %>
-driver.screenshot("allure-results/screenshots/#{example_name}.png")
-<% end %>
+<%- end -%>

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

@@ -9,9 +9,7 @@ module Raider
 <%- else -%>
   require_relative 'driver_helper'
 <%- end -%>
-<%- unless visual_automation -%>
   require_relative 'allure_helper'
-<%- end -%>
 <%- if automation == 'cross_platform' -%>
   require_relative 'appium_helper'
 <%- end -%>

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

@@ -21,9 +21,9 @@ module Raider
 
       config.after(:each) do
         example_name = self.class.descendant_filtered_examples.first.description
-        <%= ERB.new(File.read(File.expand_path('./partials/screenshot.tt', __dir__))).result(binding).strip! %>
+        <%= ERB.new(File.read(File.expand_path('./partials/screenshot.tt', __dir__)), trim_mode: '-').result(binding).strip! %>
         AllureHelper.add_screenshot example_name
-        <%= ERB.new(File.read(File.expand_path('./partials/quit_driver.tt', __dir__))).result(binding).strip! %>
+        <%= ERB.new(File.read(File.expand_path('./partials/quit_driver.tt', __dir__)), trim_mode: '-').result(binding).strip! %>
       end
     end
   end

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

@@ -2,34 +2,30 @@
 
 require 'rspec'
 require 'eyes_selenium'
-<%- if automation == 'selenium' -%>
+require_relative 'allure_helper'
 require_relative 'driver_helper'
-<%- else -%>
-require_relative 'browser_helper'
-<%- end -%>
 require_relative 'visual_helper'
 
 module Raider
   module SpecHelper
     RSpec.configure do |config|
-      config.include(<%- if automation == 'watir' -%>BrowserHelper<% else -%>DriverHelper<%- end -%>)
+      config.include(DriverHelper)
       config.include(VisualHelper)
       config.before(:each) do
         OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
         @grid_runner = create_grid_runner
         @eyes = create_eyes(@grid_runner)
         configure_eyes @eyes
-        <%- if automation == 'selenium' -%>
         @driver = @eyes.open(driver: new_driver)
-        <%- else -%>
-        @driver = @eyes.open(driver: new_browser.driver)
-        <%- end -%>
       end
 
       config.after(:each) do
+        example_name = self.class.descendant_filtered_examples.first.description
+        driver.save_screenshot("allure-results/screenshots/#{example_name}.png")
         @eyes.close
         @driver.quit
         @eyes.abort_async
+        AllureHelper.add_screenshot example_name
         results = @grid_runner.get_all_test_results
         puts results
       end

data/lib/ruby_raider.rb

@@ -26,7 +26,7 @@ module RubyRaider
     desc 'version', 'It shows the version of Ruby Raider you are currently using'
 
     def version
-      puts 'The Ruby Raider version is 0.7.0, Happy testing!'
+      puts 'The Ruby Raider version is 0.7.1, Happy testing!'
     end
 
     map 'v' => 'version'

data/ruby_raider.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'ruby_raider'
-  s.version     = '0.7.0'
+  s.version     = '0.7.2'
   s.summary     = 'A gem to make setup and start of UI automation projects easier'
   s.description = 'This gem has everything you need to start working with test automation'
   s.authors     = ['Agustin Pequeno']

data/spec/helpers_generator_spec.rb

@@ -45,10 +45,6 @@ describe HelpersGenerator do
   end
 
   shared_examples 'creates common visual helpers' do |name|
-    it 'does not create an allure helper file' do
-      expect(File).not_to exist("#{name}/helpers/allure_helper.rb")
-    end
-
     it 'creates a raider file' do
       expect(File).to exist("#{name}/helpers/raider.rb")
     end
@@ -76,12 +72,6 @@ describe HelpersGenerator do
     include_examples 'creates rspec helpers', "#{FRAMEWORKS.last}_#{AUTOMATION_TYPES[2]}_visual"
   end
 
-  context 'with rspec, watir and applitools' do
-    include_examples 'creates common visual helpers', "#{FRAMEWORKS.last}_#{AUTOMATION_TYPES[3]}_visual"
-    include_examples 'creates watir helpers', "#{FRAMEWORKS.last}_#{AUTOMATION_TYPES[3]}_visual"
-    include_examples 'creates rspec helpers', "#{FRAMEWORKS.last}_#{AUTOMATION_TYPES[3]}_visual"
-  end
-
   context 'with cucumber and selenium' do
     include_examples 'creates common helpers', "#{FRAMEWORKS.first}_#{AUTOMATION_TYPES[2]}"
     include_examples 'creates selenium helpers', "#{FRAMEWORKS.first}_#{AUTOMATION_TYPES[2]}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_raider
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Agustin Pequeno
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -212,6 +212,7 @@ files:
 - lib/generators/automation/automation_generator.rb
 - lib/generators/automation/templates/abstract_component.tt
 - lib/generators/automation/templates/abstract_page.tt
+- lib/generators/automation/templates/account_page.tt
 - lib/generators/automation/templates/appium_caps.tt
 - lib/generators/automation/templates/component.tt
 - lib/generators/automation/templates/home_page.tt
@@ -224,9 +225,11 @@ files:
 - lib/generators/automation/templates/partials/ios_caps.tt
 - lib/generators/automation/templates/partials/pdp_page_selector.tt
 - lib/generators/automation/templates/partials/require_raider.tt
+- lib/generators/automation/templates/partials/selenium_account.tt
 - lib/generators/automation/templates/partials/selenium_login.tt
 - lib/generators/automation/templates/partials/url_methods.tt
 - lib/generators/automation/templates/partials/visit_method.tt
+- lib/generators/automation/templates/partials/watir_account.tt
 - lib/generators/automation/templates/partials/watir_login.tt
 - lib/generators/automation/templates/pdp_page.tt
 - lib/generators/automation/templates/visual_options.tt
@@ -239,7 +242,7 @@ files:
 - lib/generators/cucumber/templates/partials/appium_env.tt
 - lib/generators/cucumber/templates/partials/driver_world.tt
 - lib/generators/cucumber/templates/partials/mobile_steps.tt
-- lib/generators/cucumber/templates/partials/selenium_appium_env.tt
+- lib/generators/cucumber/templates/partials/selenium_env.tt
 - lib/generators/cucumber/templates/partials/watir_env.tt
 - lib/generators/cucumber/templates/partials/watir_world.tt
 - lib/generators/cucumber/templates/partials/web_steps.tt
@@ -318,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: A gem to make setup and start of UI automation projects easier

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

@@ -1,13 +0,0 @@
-require_relative '../../helpers/driver_helper'
-
-include Raider::DriverHelper
-
-Before do
-  new_driver
-end
-
-After do |scenario|
-  driver.save_screenshot("allure-results/screenshots/#{scenario.name}.png")
-  Raider::AllureHelper.add_screenshot(scenario.name)
-  driver.quit
-end