ruby_raider 3.13.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e4d2e6fae8f8504215b558818a81660fca9652f52886c6b72f3e1d6850d01bd
-  data.tar.gz: 3a8e5a4290303aab776bce5e6e9e8c86023e88a036b935de18a2c56ded688c8c
+  metadata.gz: 36caa6e3075d166277f9cafe8073ccd81f9ada8706a3df11ce93a6073b45d130
+  data.tar.gz: 6aeedcccd3623931f16eb8e082635f93f4946e6870ca79a7de9f03478d868034
 SHA512:
-  metadata.gz: f0af4e104fc9cc2b0a99f0ebd4a996994f16500302e5f1cabf635569de8d404c30bf289ce4df145376fad0579b5cf1dc865cee19fd45e757954aa0ebcd4c75bc
-  data.tar.gz: 67dd60f0a67b57a2cd09605a7aec9b91a822d198ed95c3be94d67663f6aef5b4db0d4b024ef09bd97e764396381d12c0f0b413552efde25f87fac44d57b48d88
+  metadata.gz: 7581c5bb57fd17624148332100f3e4c963323a02f5bff6dfda8aba500b5b478bfbbcb07741f55eb73909beca99e5a88b769a0af437820507c7b9bd3977038038
+  data.tar.gz: 353af9eab7da4783e38bff479bab069a35bbed7fcd57936b22eb525c443fc7b76136c5408371424690082f164d3e76334d93f093c2219c4bbe1cb8e56d49ed0a

data/.github/workflows/runtime.yml

@@ -0,0 +1,38 @@
+name: Runtime
+
+on: [pull_request]
+
+jobs:
+  runtime:
+    name: Runtime (Ruby ${{ matrix.ruby }}, selenium ${{ matrix.selenium || 'latest' }})
+    runs-on: ubuntu-latest
+    env:
+      SELENIUM_VERSION: ${{ matrix.selenium }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.2', '3.4']
+        selenium: ['4.30.0', '4.44.0', '']
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Set up Chrome
+        uses: browser-actions/setup-chrome@v1
+
+      - name: Run runtime unit specs
+        run: bundle exec rspec spec/runtime
+
+      - name: Check the role engine syntax
+        run: node --check lib/ruby_raider/runtime/js/role_engine.js
+
+      - name: Run runtime browser specs
+        run: bundle exec rspec spec/runtime/browser --tag browser

data/.github/workflows/system_tests.yml

@@ -17,7 +17,7 @@ jobs:
           bundler-cache: true
 
   selenium:
-    name: Selenium frameworks
+    name: Selenium RSpec
     needs: setup
     runs-on: ubuntu-latest
     steps:
@@ -37,25 +37,3 @@ jobs:
 
       - name: Run Selenium system tests
         run: bundle exec rspec spec/system/selenium_spec.rb --format documentation
-
-  watir:
-    name: Watir frameworks (deprecated)
-    needs: setup
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.4'
-          bundler-cache: true
-
-      - name: Set up Chrome
-        uses: browser-actions/setup-chrome@v1
-        with:
-          chrome-version: stable
-
-      - name: Run Watir system tests
-        run: bundle exec rspec spec/system/watir_spec.rb --format documentation

data/.reek.yml

@@ -62,3 +62,4 @@ detectors:
   TooManyConstants:
     exclude:
       - 'RubyRaider::Ffmpeg' # pinned version, release URL and manifest constants
+      - 'TracePageServer' # routes, redirects and delays of the e2e page

data/.rspec

@@ -0,0 +1 @@
+--tag ~browser

data/Gemfile

@@ -3,3 +3,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'selenium-webdriver', ENV['SELENIUM_VERSION'] unless ENV['SELENIUM_VERSION'].to_s.empty?

data/README.md

@@ -33,19 +33,17 @@ Ruby Raider is a CLI gem for scaffolding and generating UI test automation frame
 
 ### Web Testing
 
-| Test Framework | Selenium | Watir (deprecated) |
-|----------------|----------|--------------------|
-| RSpec          | ✅       | ✅                 |
-| Cucumber       | ✅       | ✅                 |
+| Test Framework | Selenium |
+|----------------|----------|
+| RSpec          | ✅       |
 
-Watir is deprecated and will be removed in the next major version of ruby_raider (4.0); new projects should use Selenium. It is no longer offered in the interactive menu and is available only through `-p automation:watir` until 4.0. See [Migrating from Watir](#migrating-from-watir).
+ruby_raider 4.0 generates Selenium projects with RSpec only. Projects generated by 3.x (Cucumber, Watir) keep working on the 3.x line through the `ruby_raider` pin in their Gemfile (`~> 3.15` or an older `~> 3.x` requirement); 4.0 does not read or convert them.
 
 ### Mobile Testing (Appium)
 
 | Test Framework | iOS | Android | Cross-Platform |
 |----------------|-----|---------|----------------|
 | RSpec          | ✅  | ✅      | ✅             |
-| Cucumber       | ✅  | ✅      | ✅             |
 
 ### Optional Add-on (Web Only)
 
@@ -62,26 +60,22 @@ Every generated project comes with:
 
 - **Page Object Model** — Base page and component classes with example pages
 - **Test examples** — Working login tests against the [Raider Test Store](https://raider-test-site.onrender.com/)
-- **Raider reporting** — RSpec and Cucumber projects include [raider_reporter](https://github.com/RaiderHQ/raider_reporter), which writes results to `raider-results/` and uploads runs to your Raider Hideout server when `RAIDER_TOKEN` and `RAIDER_ENDPOINT` are set; generated CI runs the suite through `raider-reporter exec` with `RAIDER_QUARANTINE`, so quarantined tests do not fail the build; an opt-in `raider-gate` job (`RAIDER_GATE=1`) fails CI when the Raider quality gate fails
-- **Waiting** — generated Selenium and Appium projects wait for elements by themselves (`WaitHelper` and `RaiderElement`): `click`, `send_keys`, `text` and the rest poll until the element is ready, and `eventually { … }` retries assertions, so there is no implicit wait and no `sleep`; `timeout` in `config.yml` sets how long to wait
+- **Raider reporting** — Generated projects include [raider_reporter](https://github.com/RaiderHQ/raider_reporter), which writes results to `raider-results/` and uploads runs to your Raider Hideout server when `RAIDER_TOKEN` and `RAIDER_ENDPOINT` are set; generated CI runs the suite through `raider-reporter exec` with `RAIDER_QUARANTINE`, so quarantined tests do not fail the build; an opt-in `raider-gate` job (`RAIDER_GATE=1`) fails CI when the Raider quality gate fails
+- **Locators, waiting and assertions**: The runtime (`ruby_raider/runtime`), loaded by every generated project, adds waiting to Selenium and Appium themselves. Locators go beyond `id` and `css`: `label:`, `placeholder:`, `alt:`, `title:`, `text:`, `test_id:` and `by_role('button', name: 'Save')` find elements the way a person sees them, and `find_element` fails when a locator matches more than one. `find_element` and `find_elements` wait for a match, so there is no implicit wait and no `sleep`. Before an action the runtime waits until the element is ready: `click` waits until it is visible, enabled, not inert, stable and not covered; `send_keys` and `clear` until it is visible, enabled, editable and not inert; `submit` until it is visible, enabled and not inert (on native apps, displayed and enabled); `force: true` skips the checks for one call. `timeout`, `strict` and `actionability` in `config.yml` (or `RAIDER_TIMEOUT`, `RAIDER_STRICT`, `RAIDER_ACTIONABILITY`) set the rules. RSpec matchers (`have_text`, `have_value`, `have_attribute`, `have_css`, `have_xpath`, `be_visible`, `be_hidden`, `be_enabled`, `be_disabled`, `be_checked`, `have_count`, `have_title`, `have_url`, `have_element`) retry until the page matches, and a block expectation such as `expect { driver.find_element(id: 'status').text }.to eq('done')` retries with any value matcher
 - **Example tests or a skeleton (`examples:false`)** — start from the working login examples, or pass `examples:false` for an empty skeleton with the helpers, config, CI and README (see [Getting Started](#getting-started))
-- **Login reuse** — generated web projects (Selenium or Watir) log in once and restore the saved session for examples tagged `:logged_in` (RSpec) or `@logged_in` (Cucumber); `RAIDER_LOGIN_STATE=off|refresh` and `login_state: max_age:` control it, and the state stays in git-ignored `.raider/auth/`
-- **Failure video replay** — Every test is recorded and the video is kept only for failing tests, attached to the report as `video` (WebM from page screenshots for Selenium and Watir, Appium's own MP4 for mobile, which needs `ffmpeg` on the Appium server host for iOS and for Android recordings over 180 s). Turn it off per run with `VIDEO=off`, or per project with `raider u video off`; ffmpeg is downloaded once, SHA-256 checked and cached in `~/.cache/raider`. The RaiderHQ `ffmpeg-7.1` build that the download uses is not published yet, so for now set `RAIDER_FFMPEG_PATH` to an ffmpeg with libvpx to get web videos
-- **Failure trace replay** (Selenium with RSpec or Cucumber) — Failing tests keep a step-by-step trace: each action with its locator and wait time, a screenshot and the page HTML after every step that changes the page, plus network requests and console messages on Chrome, Edge and Firefox. It is saved as `raider-results/attachments/<n>-trace.zip`, attached to the report as `trace` and opened in Raider Desktop or on Hideout. `TRACE=on` keeps passing tests too, `TRACE=off` captures nothing, and `raider u trace on|off` sets it for the project. Typed values in password fields and `RAIDER_SECRET_*` values are hidden; other typed values, page text and URLs are kept, so treat a trace like the video. Request headers, cookies and bodies are never captured
+- **Login reuse** — generated web projects (Selenium) log in once and restore the saved session for examples tagged `:logged_in`; `RAIDER_LOGIN_STATE=off|refresh` and `login_state: max_age:` control it, and the state stays in git-ignored `.raider/auth/`
+- **Failure video replay** — Every test is recorded and the video is kept only for failing tests, attached to the report as `video` (WebM from page screenshots for Selenium, Appium's own MP4 for mobile, which needs `ffmpeg` on the Appium server host for iOS and for Android recordings over 180 s). Turn it off per run with `VIDEO=off`, or per project with `raider u video off`; ffmpeg is downloaded once, SHA-256 checked and cached in `~/.cache/raider`. The RaiderHQ `ffmpeg-7.1` build that the download uses is not published yet, so for now set `RAIDER_FFMPEG_PATH` to an ffmpeg with libvpx to get web videos
+- **Failure trace replay** (Selenium) — Failing tests keep a step-by-step trace: each action with its locator and wait time, a screenshot and the page HTML after every step that changes the page, plus network requests and console messages on Chrome, Edge and Firefox. It is saved as `raider-results/attachments/<n>-trace.zip`, attached to the report as `trace` and opened in Raider Desktop or on Hideout. `TRACE=on` keeps passing tests too, `TRACE=off` captures nothing, and `raider u trace on|off` sets it for the project. Typed values in password fields and `RAIDER_SECRET_*` values are hidden; other typed values, page text and URLs are kept, so treat a trace like the video. Request headers, cookies and bodies are never captured
+- **Network mocking** (Selenium) — Answer a request with your own response or block it, from the test: `mock_request('**/api/users', json: { users: [] })`, `mock_request(url, status: 500)` and `block_request('**/*.png')`, with `calls` to check what the page asked for. It uses WebDriver BiDi on Chrome, Edge and Firefox (Safari and `BIDI=off` raise `NetworkHelper::Unavailable`), handles CORS for cross-origin mocks, clears mocks after each test, and marks mocked requests in the trace
+- **Screenshot comparison** (Selenium) — `match_screenshot('home')` compares the page, or an element with `element:`, with a baseline in `screenshots/baselines/<browser>/`. The first run saves the baseline; later runs fail on a difference and attach the expected, actual and diff pictures to the report and the trace. `SCREENSHOTS=update` rewrites baselines, a missing baseline fails on CI, and tolerances (`threshold`, `max_diff_pixels`, `max_diff_ratio`) go in `config/config.yml` under `screenshots:`. Generate baselines where CI runs: a Retina laptop makes 2x pictures
 - **GitHub Actions CI** — Ready-to-use test pipeline that caches ffmpeg for failure videos
 - **Rake tasks** — Default, smoke, and regression tasks with tag-based filtering
 - **Retry support** — RSpec retry with configurable retry count via `RETRY_COUNT` env var
-- **Re-run failed tests** — RSpec keeps `spec/examples.txt` for `--only-failures`; Cucumber projects write failed scenarios to `rerun.txt`
+- **Re-run failed tests** — RSpec keeps `spec/examples.txt` for `--only-failures`
 - **Parallel execution** — parallel_tests and parallel_split_test gems included
 - **Configurable browser** — Chrome/Firefox with customizable arguments, viewport, timeout, and headless mode
 - **Linting** — RuboCop and Reek configs included
 
-> **Upgrading from 3.9 or earlier:** existing projects are not changed automatically. To get failure videos, generate a
-> new project with the same options and copy `helpers/video_helper.rb`, the video lines in `helpers/spec_helper.rb`
-> (RSpec) or `features/support/env.rb` (Cucumber), the `listener:` in the driver or browser helper, the `video:` block
-> in `config/config.yml`, and the ffmpeg cache and install steps in your CI pipeline. raider_reporter 0.10 or later
-> adds the inline video player in `raider-results/index.html` and a larger size limit for video attachments.
-
 For Appium projects, download the example [app](https://github.com/RaiderHQ/raider_test_app) and start the server:
 
 ```bash
@@ -129,34 +123,7 @@ Generate an empty skeleton, without the example pages and tests (the menu asks `
 raider new my_project -p framework:rspec automation:selenium examples:false
 ```
 
-The skeleton keeps the helpers, config, CI and README, and its empty suite passes; grow it with `raider g`. Watir projects always include the examples.
-
-## Migrating from Watir
-
-Watir is deprecated; to move a Watir project to Selenium, generate a Selenium project and port your pages. The common mappings:
-
-| Watir | Selenium project (waiting layer) |
-|-------|----------------------------------|
-| `browser.goto(url)` | `driver.navigate.to(url)` |
-| `browser.text_field(id: 'x').set(v)` | `clear({ id: 'x' })` and `send_keys({ id: 'x' }, v)` |
-| `browser.button(id: 'x').click` | `click({ id: 'x' })` |
-| `Watir.default_timeout = n` | `timeout: n` in `config/config.yml` |
-
-## Adopting waiting in an existing project
-
-Gem upgrades do not rewrite generated code, so existing projects keep their implicit wait until you opt in:
-
-1. Copy both `helpers/wait_helper.rb` and `helpers/raider_element.rb` from a freshly generated project into your
-   `helpers/` folder. Keep them side by side: `wait_helper.rb` loads the other with `require_relative 'raider_element'`.
-2. Include it in `Page`, the spec helper, or the World, after loading it with `require_relative`, for example
-   `require_relative '../../helpers/wait_helper'` at the top of `page_objects/abstract/page.rb`.
-3. Set how long it waits: add `timeout: 10` to `config/config.yml`. Single-platform mobile projects (iOS or Android
-   only) have no `config/config.yml`, so pass `timeout:` to a call, or create `config/config.yml` with that line;
-   without either, it waits 10 seconds.
-4. Remove the `implicit_wait` line.
-5. Move flaky spots to `click`, `send_keys` and `eventually` first.
-
-Keep in mind that keeping the implicit wait while using the layer makes every `find` miss cost up to `timeout` seconds per poll cycle, so remove it once you have moved over.
+The skeleton keeps the helpers, config, CI and README, and its empty suite passes; grow it with `raider g`.
 
 ## Commands
 
@@ -179,11 +146,9 @@ Shortcuts: `n` (new), `g` (generate), `u` (utility), `v` (version)
 ```
 raider g page [NAME]            # Create a page object
 raider g spec [NAME]            # Create an RSpec test
-raider g feature [NAME]         # Create a Cucumber feature
-raider g steps [NAME]           # Create step definitions
 raider g helper [NAME]          # Create a helper class
 raider g component [NAME]       # Create a component class
-raider g scaffold [NAME(S)]     # Create page + test + steps
+raider g scaffold [NAME(S)]     # Create page + spec
 ```
 
 Options:
@@ -198,6 +163,8 @@ raider u url [URL]              # Set default project URL
 raider u browser [BROWSER]      # Set default browser
 raider u browser_options [OPTS] # Set browser arguments (e.g., no-sandbox, headless)
 raider u headless [on/off]      # Toggle headless mode
+raider u strict [on/off]        # Toggle strict find_element (fail on multiple matches)
+raider u actionability [on/off] # Toggle the actionability wait before element actions
 raider u raid                   # Run all tests (-p for parallel)
 raider u timeout [SECONDS]      # Set test timeout
 raider u viewport [DIMENSIONS]  # Set viewport size (e.g., 1920x1080)

data/RELEASE.md

@@ -2,6 +2,28 @@
 
 ## Release Notes
 
+### 4.0.0
+
+- Watir is removed: `automation:watir` is no longer a valid automation value.
+- Cucumber is removed: `raider new` generates RSpec projects only and `framework:cucumber` is no longer a valid framework value.
+- `raider g feature`, `raider g steps` and `raider u path --feature` are removed; `raider g scaffold` always writes a spec and a page.
+- Generated projects no longer emit `cucumber_step` trace groups.
+- ruby_raider now depends on selenium-webdriver >= 4.30.
+- Every generated project loads `require 'ruby_raider/runtime'`, which adds waiting and actionability to Selenium and Appium themselves.
+- `WaitHelper`, `RaiderElement`, `helpers/wait_helper.rb` and `helpers/raider_element.rb` are removed. Page objects call Selenium and Appium directly (`driver.find_element(...)`, `element.click`, `element.send_keys`).
+- New locator keys `label`, `placeholder`, `alt`, `title`, `text` and `test_id`, and `by_role(role, name:, exact:, include_hidden:, level:)`.
+- `find_element` is strict: it fails with `Raider::AmbiguousMatch` when a locator matches more than one element. `find_elements` never does.
+- `find_element` and `find_elements` wait for a match (`find_elements` returns `[]` at the deadline). A missing element fails with `no such element: { id: "x" } (waited 10s)`.
+- `eventually` is removed. Block-form expectations retry: `expect { value }.to eq(...)` works with any value matcher. RSpec's block matchers (`raise_error`, `change`, `output`, `throw_symbol`, `yield_*`) keep their stock behaviour, and `expect(value)` without a block does not retry.
+- New RSpec matchers `have_text`, `have_value`, `have_attribute`, `be_visible`, `be_hidden`, `be_enabled`, `be_disabled`, `be_checked`, `have_count`, `have_title`, `have_url`, `have_element`, `have_css` and `have_xpath`, each with `wait:`.
+- `click`, `send_keys`, `clear` and `submit` wait until the element is actionable (visible, enabled, not inert, stable, receives events). `force: true` skips the checks for one call.
+- Native Appium actions wait for the element to be displayed and enabled. On XCUITest an element reported as not displayed waits the full `timeout` and then raises `Raider::NotActionable`; use `force: true` or `Raider.actionability = false` as the way out.
+- `config/config.yml` gets `strict` and `actionability` next to `timeout`. `raider u strict on|off` and `raider u actionability on|off` set them, and `RAIDER_TIMEOUT`, `RAIDER_STRICT`, `RAIDER_ACTIONABILITY` and `RAIDER_QUIET` apply to every project, including single-platform mobile projects, which have no `config.yml`.
+- Mobile gestures (`swipe`, `scroll`, `scroll_to`) move to `helpers/gesture_helper.rb`.
+- Traces record element actions from the runtime: `click`, `send_keys`, `clear` and `submit` with their locators, `within` and `waited_ms`. `text`, `find_element` and other reads are no longer steps, and there are no `eventually` groups.
+- The generated Gemfile pins `raider_reporter` `~> 1.0` (1.0.0 drops the Cucumber plugin).
+- Existing projects pin `gem 'ruby_raider', '~> 3.15'` (or an older `~> 3.x`) in their Gemfile, so `bundle update` never moves them to 4.0; to upgrade, change the pin to `~> 4.0` and run `bundle update ruby_raider`.
+
 ### 3.7.0
 
 - Generated RSpec projects no longer include Allure: the `allure-rspec` and `allure-ruby-commons` gems, `helpers/allure_helper.rb`, the `allure-results` folder and `.gitignore` entry, and the Allure report and gh-pages steps in the GitHub Actions workflow are gone. `raider_reporter` is now the only reporter.

data/bin/raider

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# Read and write UTF-8 whatever the locale: a shell with no LANG (macOS GUI apps) defaults Ruby to US-ASCII,
+# which broke the generator templates and any command that edits a generated file.
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 require_relative '../lib/ruby_raider'
 
 RubyRaider::Raider.start

data/lib/commands/scaffolding_commands.rb

@@ -20,14 +20,6 @@ class ScaffoldingCommands < Thor
     generate_scaffolding(name, 'page', options[:path])
   end
 
-  desc 'feature [NAME]', 'Creates a new feature'
-  option :path, type: :string, required: false,
-                desc: 'The path where your feature will be created', aliases: '-p'
-
-  def feature(name)
-    generate_scaffolding(name, 'feature', options[:path])
-  end
-
   desc 'spec [SPEC_NAME]', 'Creates a new spec'
   option :path, type: :string, required: false,
                 desc: 'The path where your spec will be created', aliases: '-p'
@@ -44,14 +36,6 @@ class ScaffoldingCommands < Thor
     generate_scaffolding(name, 'helper', options[:path])
   end
 
-  desc 'steps [STEPS_NAME]', 'Creates a new steps definition'
-  option :path, type: :string, required: false,
-                desc: 'The path where your steps will be created', aliases: '-p'
-
-  def steps(name)
-    generate_scaffolding(name, 'steps', options[:path])
-  end
-
   desc 'component [NAME]', 'Creates a component inheriting from Component'
   option :path, type: :string, required: false,
                 desc: 'The path where your component will be created', aliases: '-p'
@@ -60,7 +44,7 @@ class ScaffoldingCommands < Thor
     generate_scaffolding(name, 'component', options[:path])
   end
 
-  desc 'scaffold [NAMES...]', 'Generates pages, specs/features, and helpers for one or more names'
+  desc 'scaffold [NAMES...]', 'Generates pages, specs, and helpers for one or more names'
 
   def scaffold(*names)
     names.each { |name| generate_default_scaffold(name) }
@@ -83,9 +67,7 @@ class ScaffoldingCommands < Thor
         say 'Warning: No Gemfile found, defaulting to selenium + rspec templates.', :yellow
       else
         automation = ScaffoldProjectDetector.detect_automation(gemfile)
-        framework = ScaffoldProjectDetector.detect_framework(gemfile)
         say 'Warning: Could not detect automation library from Gemfile, defaulting to selenium.', :yellow if automation.nil?
-        say 'Warning: Could not detect test framework from Gemfile, defaulting to rspec.', :yellow if framework.nil?
       end
     end
 
@@ -97,12 +79,7 @@ class ScaffoldingCommands < Thor
 
     def generate_default_scaffold(name)
       validate_project!
-      if Pathname.new('spec').exist? && !Pathname.new('features').exist?
-        generate_scaffolding(name, 'spec', load_config_path('spec'))
-      else
-        generate_scaffolding(name, 'feature', load_config_path('feature'))
-        generate_scaffolding(name, 'steps', load_config_path('steps'))
-      end
+      generate_scaffolding(name, 'spec', load_config_path('spec'))
       generate_scaffolding(name, 'page', load_config_path('page'))
     end
   end

data/lib/commands/utility_commands.rb

@@ -7,8 +7,6 @@ class UtilityCommands < Thor
   def self.exit_on_failure? = true
 
   desc 'path [PATH]', 'Sets the default path for scaffolding'
-  option :feature,
-         type: :boolean, required: false, desc: 'The default path for your features', aliases: '-f'
   option :helper,
          type: :boolean, required: false, desc: 'The default path for your helpers', aliases: '-h'
   option :spec,
@@ -49,12 +47,28 @@ class UtilityCommands < Thor
   desc 'headless [on/off]', 'Toggles headless mode for browser tests'
 
   def headless(toggle)
-    enabled = %w[on true 1 yes].include?(toggle.downcase)
+    enabled = on?(toggle)
     Utilities.headless = enabled
     state = enabled ? 'enabled' : 'disabled'
     say "Headless mode #{state}", :green
   end
 
+  desc 'strict [on/off]', 'Toggles strict find_element (fails when a locator matches more than one element)'
+
+  def strict(toggle)
+    enabled = on?(toggle)
+    Utilities.strict = enabled
+    say "Strict mode #{enabled ? 'enabled' : 'disabled'}", :green
+  end
+
+  desc 'actionability [on/off]', 'Toggles the actionability wait before element actions'
+
+  def actionability(toggle)
+    enabled = on?(toggle)
+    Utilities.actionability = enabled
+    say "Actionability #{enabled ? 'enabled' : 'disabled'}", :green
+  end
+
   desc 'raid', 'It runs all the tests in a project'
   option :parallel,
          type: :boolean, required: false, desc: 'It runs the tests in parallel', aliases: '-p'
@@ -160,4 +174,10 @@ class UtilityCommands < Thor
       say "Failure video #{enabled ? 'enabled' : 'disabled'}", :green
     end
   end
+
+  private
+
+  def on?(toggle)
+    %w[on true 1 yes].include?(toggle.downcase)
+  end
 end

data/lib/generators/automation/automation_generator.rb

@@ -17,7 +17,6 @@ class AutomationGenerator < Generator
       generate_home_page
       generate_pdp_page
     else
-      generate_header_component
       generate_model_files
       generate_pages
     end
@@ -67,10 +66,6 @@ class AutomationGenerator < Generator
     template('pdp.tt', "#{name}/page_objects/pages/pdp.rb")
   end
 
-  def generate_header_component
-    template('header.tt', "#{name}/page_objects/components/header.rb")
-  end
-
   def generate_model_factory
     template('factory.tt', "#{name}/models/model_factory.rb")
   end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Component
+  # `component` is a Selenium element: `component.find_element(...)` searches inside it.
   attr_reader :component
 
   def initialize(component)

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

@@ -6,7 +6,7 @@ class Home < Page
   # Actions
 
   def go_to_product_detail
-    tap(first_product)
+    first_product.click
   end
 
   private
@@ -14,6 +14,6 @@ class Home < Page
   # Elements
 
   def first_product
-    <%= partial('home_page_selector') -%>
+    <%= cross_platform? ? 'element(' : 'driver.find_element(' -%><%= partial('home_page_selector').strip -%>)
   end
 end

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

@@ -9,46 +9,26 @@ class Login < Page
 
   # Actions
 
-<%- if selenium_based? -%>
   def login(username, password)
-    send_keys(username_field, username)
-    send_keys(password_field, password)
-    click(login_button)
-  end
-  alias log_as login
-<%- else -%>
-  def login(username, password)
-    username_field.set username
-    password_field.set password
+    username_field.send_keys(username)
+    password_field.send_keys(password)
     login_button.click
   end
-<%- end -%>
+  alias log_as login
 
   private
 
   # Elements
 
   def username_field
-<%- if selenium_based? -%>
-    { id: 'loginFrm_loginname' }
-<%- else -%>
-    browser.text_field(id: 'loginFrm_loginname')
-<%- end -%>
+    driver.find_element(id: 'loginFrm_loginname')
   end
 
   def password_field
-<%- if selenium_based? -%>
-    { id: 'loginFrm_password' }
-<%- else -%>
-    browser.text_field(id: 'loginFrm_password')
-<%- end -%>
+    driver.find_element(id: 'loginFrm_password')
   end
 
   def login_button
-<%- if selenium_based? -%>
-    { xpath: "//button[@title='Login']" }
-<%- else -%>
-    browser.button(xpath: "//button[@title='Login']")
-<%- end -%>
+    driver.find_element(by_role('button', name: 'Login'))
   end
 end

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

@@ -1,22 +1,34 @@
 # frozen_string_literal: true
 
-<%- if web? && examples? -%>
-require_relative '../components/header'
+require 'ruby_raider/runtime'
+<%- if cross_platform? -%>
+require_relative '../../helpers/appium_helper'
+<%- end -%>
+<%- if mobile? -%>
+require_relative '../../helpers/gesture_helper'
+<%- end -%>
+<%- if network_helper? -%>
+require_relative '../../helpers/network_helper'
 <%- end -%>
-<%- if wait_helper? -%>
-require_relative '../../helpers/wait_helper'
+<%- if screenshot_helper? -%>
+require_relative '../../helpers/screenshot_helper'
 <%- end -%>
 
 class Page
 <%- if cross_platform? -%>
   include AppiumHelper
 <%- end -%>
-<%- if wait_helper? -%>
-  include WaitHelper
+  include Raider::Helpers
+<%- if mobile? -%>
+  include GestureHelper
 <%- end -%>
-<%- if cross_platform? || wait_helper? -%>
-
+<%- if network_helper? -%>
+  include NetworkHelper
+<%- end -%>
+<%- if screenshot_helper? -%>
+  include ScreenshotHelper
 <%- end -%>
+
 <%= partial('initialize_selector') -%>
 <%= partial('visit_method') -%>
 <%= partial('url_methods') -%>
@@ -26,17 +38,10 @@ class Page
   end
   <%- if selenium_based? && examples? -%>
 
-  # Components
-
-  def header
-    Header.new(find_element(css: '.welcome-msg'))
-  end
-  <%- elsif watir? -%>
-
-  # Components
+  # Elements
 
-  def header
-    Header.new(browser.element(css: '.welcome-msg'))
+  def welcome_message
+    driver.find_element(css: '.welcome-msg')
   end
   <%- end -%>
 end

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

@@ -1,6 +1,5 @@
 <%- if cross_platform? -%>
-{ ios: { accessibility_id: 'product-item-1' },
-      android: { accessibility_id: 'product-item-1' } }
+{ ios: { accessibility_id: 'product-item-1' }, android: { accessibility_id: 'product-item-1' } }
 <%- else -%>
 { accessibility_id: 'product-item-1' }
 <%- end -%>

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

@@ -1,13 +1,5 @@
-<%- if watir? -%>
-  attr_reader :browser
-
-  def initialize(browser)
-    @browser = browser
-  end
-<%- else -%>
   attr_reader :driver
 
   def initialize(driver)
     @driver = driver
   end
-<%- end -%>

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

@@ -1,6 +1,5 @@
 <%- if cross_platform? -%>
-{ ios: { accessibility_id: 'add-to-cart-button' },
-      android: { accessibility_id: 'add-to-cart-button' } }
+{ ios: { accessibility_id: 'add-to-cart-button' }, android: { accessibility_id: 'add-to-cart-button' } }
 <%- else -%>
 { accessibility_id: 'add-to-cart-button' }
 <%- end -%>

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

@@ -1,11 +1,17 @@
 <%- if web? -%>
 
   def full_url(*page)
-    "#{base_url}#{url(*page)}"
+    path = url(*page).to_s
+    base = base_url
+    base.empty? ? path : "#{base}#{path.delete_prefix('/')}"
   end
 
+  # The configured url with a trailing slash, so page paths never run into its last segment.
   def base_url
-    YAML.load_file('config/config.yml')['url']
+    base = YAML.load_file('config/config.yml')['url'].to_s
+    return base if base.empty? || base.end_with?('/')
+
+    "#{base}/"
   end
 
   def url(_page)

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

@@ -3,9 +3,4 @@
   def visit(*page)
     @driver.navigate.to full_url(page.first)
   end
-<%- elsif watir? -%>
-
-  def visit(*page)
-    @browser.goto full_url(page.first)
-  end
 <%- end -%>

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

@@ -3,17 +3,9 @@
 require_relative '../abstract/page'
 
 class Pdp < Page
-  # Actions
-
-  def add_to_cart_text
-    text(add_to_cart_button)
-  end
-
-  private
-
   # Elements
 
   def add_to_cart_button
-    <%= partial('pdp_page_selector') -%>
+    <%= cross_platform? ? 'element(' : 'driver.find_element(' -%><%= partial('pdp_page_selector').strip -%>)
   end
 end

data/lib/generators/common_generator.rb

@@ -34,8 +34,6 @@ class CommonGenerator < Generator
   end
 
   def generate_rspec_file
-    return unless rspec?
-
     template('common/rspec.tt', "#{name}/.rspec")
   end
 end