summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 15:06:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 15:06:20 +0000
commit4204cf308596e0e26f578a6e2da88f49c0f4aad9 (patch)
tree644447bcb576a459e079318b06712b7c89416e2b /qa
parentcd4cb29b2c304f00d238ee72fe40c767cb3e2675 (diff)
downloadgitlab-ce-4204cf308596e0e26f578a6e2da88f49c0f4aad9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb (renamed from qa/qa/specs/features/browser_ui/1_manage/mail/trigger_mail_notification_spec.rb)6
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/specs/features/browser_ui/1_manage/mail/trigger_mail_notification_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
index d3bb269bcb3..57063e91532 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/mail/trigger_mail_notification_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
module QA
- context 'Manage', :orchestrated, :smtp do
- describe 'mail notification' do
+ context 'Plan', :orchestrated, :smtp do
+ describe 'Email Notification' do
let(:user) do
Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
end
@@ -17,7 +17,7 @@ module QA
Flow::Login.sign_in
end
- it 'user receives email for project invitation' do
+ it 'is received by a user for project invitation' do
Flow::Project.add_member(project: project, username: user.username)
expect(page).to have_content(/@#{user.username}(\n| )?Given access/)