diff options
-rw-r--r-- | qa/qa/scenario/test/instance.rb | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/login/standard_spec.rb | 2 | ||||
-rw-r--r-- | qa/qa/specs/features/project/create_spec.rb | 2 | ||||
-rw-r--r-- | qa/qa/specs/features/repository/clone_spec.rb | 2 | ||||
-rw-r--r-- | qa/qa/specs/features/repository/push_spec.rb | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/qa/qa/scenario/test/instance.rb b/qa/qa/scenario/test/instance.rb index 1557fdeff34..689292bc60b 100644 --- a/qa/qa/scenario/test/instance.rb +++ b/qa/qa/scenario/test/instance.rb @@ -6,7 +6,7 @@ module QA # including staging and on-premises installation. # class Instance < Scenario::Template - def perform(address, tag, *files) + def perform(address, *files) Specs::Config.perform do |specs| specs.address = address end @@ -17,9 +17,7 @@ module QA Runtime::Release.perform_before_hooks Specs::Runner.perform do |specs| - files = files.any? ? files : 'qa/specs/features' - - specs.rspec('--tty', '--tag', tag.to_s, files) + specs.rspec('--tty', files.any? ? files : 'qa/specs/features') end end end diff --git a/qa/qa/specs/features/login/standard_spec.rb b/qa/qa/specs/features/login/standard_spec.rb index ecb3f0cb68c..8e1ae6efa47 100644 --- a/qa/qa/specs/features/login/standard_spec.rb +++ b/qa/qa/specs/features/login/standard_spec.rb @@ -1,5 +1,5 @@ module QA - feature 'standard root login', :ce, :ee do + feature 'standard root login' do scenario 'user logs in using credentials' do Page::Main::Entry.act { sign_in_using_credentials } diff --git a/qa/qa/specs/features/project/create_spec.rb b/qa/qa/specs/features/project/create_spec.rb index cf4226252a6..610492b9717 100644 --- a/qa/qa/specs/features/project/create_spec.rb +++ b/qa/qa/specs/features/project/create_spec.rb @@ -1,5 +1,5 @@ module QA - feature 'create a new project', :ce, :ee, :staging do + feature 'create a new project' do scenario 'user creates a new project' do Page::Main::Entry.act { sign_in_using_credentials } diff --git a/qa/qa/specs/features/repository/clone_spec.rb b/qa/qa/specs/features/repository/clone_spec.rb index a772dc227e3..521bd955857 100644 --- a/qa/qa/specs/features/repository/clone_spec.rb +++ b/qa/qa/specs/features/repository/clone_spec.rb @@ -1,5 +1,5 @@ module QA - feature 'clone code from the repository', :ce, :ee, :staging do + feature 'clone code from the repository' do context 'with regular account over http' do given(:location) do Page::Project::Show.act do diff --git a/qa/qa/specs/features/repository/push_spec.rb b/qa/qa/specs/features/repository/push_spec.rb index 4b6cb7908bb..5fe45d63d37 100644 --- a/qa/qa/specs/features/repository/push_spec.rb +++ b/qa/qa/specs/features/repository/push_spec.rb @@ -1,5 +1,5 @@ module QA - feature 'push code to repository', :ce, :ee, :staging do + feature 'push code to repository' do context 'with regular account over http' do scenario 'user pushes code to the repository' do Page::Main::Entry.act { sign_in_using_credentials } |