summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamya Authappan <rauthappan@gitlab.com>2019-07-23 13:31:47 +0000
committerRamya Authappan <rauthappan@gitlab.com>2019-07-23 13:31:47 +0000
commitfcb09f0f4a3cf7cceec48dbae1e8f4bec04b9469 (patch)
treec8454dc2a16011be637daecfdc6336298308f5d3
parenta9c7bda8f6f63c774bf723aeaefa47e98ccdfb2a (diff)
parent50a24da200be48940af2eeba075a69d9fd1fd35b (diff)
downloadgitlab-ce-fcb09f0f4a3cf7cceec48dbae1e8f4bec04b9469.tar.gz
Merge branch 'sl-qa-staging-65-fix-correct-page-issue' into 'master'
Ensure test is on login page before attempting login See merge request gitlab-org/gitlab-ce!31040
-rw-r--r--qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
index 425fb861456..70c03e10449 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
@@ -3,7 +3,7 @@
module QA
context 'Plan' do
describe 'check xss occurence in @mentions in issues' do
- before do
+ it 'user mentions a user in comment' do
QA::Runtime::Env.personal_access_token = QA::Runtime::Env.admin_personal_access_token
unless QA::Runtime::Env.personal_access_token
@@ -20,6 +20,8 @@ module QA
Page::Main::Menu.perform(&:sign_out) if Page::Main::Menu.perform { |p| p.has_personal_area?(wait: 0) }
+ Runtime::Browser.visit(:gitlab, Page::Main::Login)
+
Page::Main::Login.perform(&:sign_in_using_credentials)
project = Resource::Project.fabricate_via_api! do |resource|
@@ -37,9 +39,7 @@ module QA
issue.project = project
end
issue.visit!
- end
- it 'user mentions a user in comment' do
Page::Project::Issue::Show.perform do |show|
show.select_all_activities_filter
show.comment('cc-ing you here @eve')