Commit c380d3ac authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'qa-change-sanity-failing-to-sanity-framework' into 'master'

[QA] Change Test::Sanity::Failing to Test::Sanity::Framework

See merge request gitlab-org/gitlab-ce!21568
parents d5cc0c8d cbae3e97
...@@ -100,7 +100,7 @@ module QA ...@@ -100,7 +100,7 @@ module QA
end end
module Sanity module Sanity
autoload :Failing, 'qa/scenario/test/sanity/failing' autoload :Framework, 'qa/scenario/test/sanity/framework'
autoload :Selectors, 'qa/scenario/test/sanity/selectors' autoload :Selectors, 'qa/scenario/test/sanity/selectors'
end end
end end
......
...@@ -63,6 +63,14 @@ module QA ...@@ -63,6 +63,14 @@ module QA
'/users/sign_in' '/users/sign_in'
end end
def sign_in_tab?
page.has_button?('Sign in')
end
def ldap_tab?
page.has_button?('LDAP')
end
def switch_to_sign_in_tab def switch_to_sign_in_tab
click_on 'Sign in' click_on 'Sign in'
end end
...@@ -90,8 +98,8 @@ module QA ...@@ -90,8 +98,8 @@ module QA
end end
def sign_in_using_gitlab_credentials(user) def sign_in_using_gitlab_credentials(user)
switch_to_sign_in_tab unless page.has_button?('Sign in') switch_to_sign_in_tab unless sign_in_tab?
switch_to_standard_tab if page.has_content?('LDAP') switch_to_standard_tab if ldap_tab?
fill_in :user_login, with: user.username fill_in :user_login, with: user.username
fill_in :user_password, with: user.password fill_in :user_password, with: user.password
......
...@@ -5,12 +5,13 @@ module QA ...@@ -5,12 +5,13 @@ module QA
module Test module Test
module Sanity module Sanity
## ##
# This scenario exits with a 1 exit code. # This scenario runs 1 passing example, and 1 failing example, and exits
# with a 1 exit code.
# #
class Failing < Template class Framework < Template
include Bootable include Bootable
tags :failing tags :framework
end end
end end
end end
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Sanity checks', :orchestrated, :failing do context 'Framework sanity checks', :orchestrated, :framework do
describe 'Passing orchestrated example' do
it 'succeeds' do
Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.perform do |main_login|
expect(main_login.sign_in_tab?).to be(true)
end
end
end
describe 'Failing orchestrated example' do describe 'Failing orchestrated example' do
it 'always fails' do it 'fails' do
Runtime::Browser.visit(:gitlab, Page::Main::Login) Runtime::Browser.visit(:gitlab, Page::Main::Login)
expect(page).to have_text("These Aren't the Texts You're Looking For", wait: 1) expect(page).to have_text("These Aren't the Texts You're Looking For", wait: 1)
......
describe QA::Scenario::Test::Sanity::Framework do
it_behaves_like 'a QA scenario class' do
let(:tags) { [:framework] }
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment