summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-03-13 10:56:00 +0000
committerJohn Jarvis <jarv@gitlab.com>2019-03-13 14:42:41 +0100
commit5841ecb7313090c8db931a525206c879256ba064 (patch)
treec89d8bae503cb0278190aa6a427442016738b088
parentb2d300f3b7fe5afba0a353e4364c6e379c2211be (diff)
downloadgitlab-ce-5841ecb7313090c8db931a525206c879256ba064.tar.gz
Merge branch 'qa-staging-45-fix-add-project-member-spec' into 'master'
Ignore user status emoji in assertion Closes gitlab-org/quality/staging#45 See merge request gitlab-org/gitlab-ce!26085
-rw-r--r--qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
index ff60e7064bf..d8609aa037a 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
module QA
- # Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/45
- context 'Manage', :quarantine do
+ context 'Manage' do
describe 'Add project member' do
it 'user adds project member' do
Runtime::Browser.visit(:gitlab, Page::Main::Login)
@@ -20,7 +19,7 @@ module QA
page.add_member(user.username)
end
- expect(page).to have_content("#{user.name} @#{user.username} Given access")
+ expect(page).to have_content(/#{user.name} (. )?@#{user.username} Given access/)
end
end
end