diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-11-17 16:55:26 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-11-17 16:55:26 +0000 |
| commit | 6be542bb03aa56af9c8390471deee70ae5399b07 (patch) | |
| tree | ef56e302dc1addb248c36bee39be7dada945184a | |
| parent | c406824d319e5b1a073af7cf55c3f24bfa66e2a4 (diff) | |
| parent | 9799d363db7e54f615853b5e1428453ff8bbc2da (diff) | |
| download | gitlab-ce-6be542bb03aa56af9c8390471deee70ae5399b07.tar.gz | |
Merge branch 'qa/gb/fix-subject-address-in-factories' into 'master'
Fix QA test subject address by configuring capybara
Closes gitlab-qa#113
See merge request gitlab-org/gitlab-ce!15446
| -rw-r--r-- | qa/qa/scenario/entrypoint.rb | 1 | ||||
| -rw-r--r-- | qa/qa/specs/config.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/qa/qa/scenario/entrypoint.rb b/qa/qa/scenario/entrypoint.rb index ae099fd911e..b9d924651a0 100644 --- a/qa/qa/scenario/entrypoint.rb +++ b/qa/qa/scenario/entrypoint.rb @@ -8,6 +8,7 @@ module QA include Bootable def perform(address, *files) + Specs::Config.act { configure_capybara! } Runtime::Scenario.define(:gitlab_address, address) ## diff --git a/qa/qa/specs/config.rb b/qa/qa/specs/config.rb index 9f9fe9844d2..bce7923e52d 100644 --- a/qa/qa/specs/config.rb +++ b/qa/qa/specs/config.rb @@ -9,6 +9,8 @@ require 'selenium-webdriver' module QA module Specs class Config < Scenario::Template + include Scenario::Actable + def perform configure_rspec! configure_capybara! |