diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-04-07 20:03:55 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-04-07 20:03:55 -0500 |
commit | f058b52b50c76de9557b167a1a31a5c9ba446f31 (patch) | |
tree | 047f04c2b0ed83ed71a6b39e64f55c40eded838b /spec/features | |
parent | 130a1e86e215d5d43cd3c53a44589aa5b8c69aab (diff) | |
parent | 7d3f37b0b879af562dc7c499bdbfcb230ed718a4 (diff) | |
download | gitlab-ce-f058b52b50c76de9557b167a1a31a5c9ba446f31.tar.gz |
Merge branch 'master' into new-resolvable-discussion
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/dashboard/project_member_activity_index_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/dashboard/project_member_activity_index_spec.rb b/spec/features/dashboard/project_member_activity_index_spec.rb index d62839a09ef..49d93db58a9 100644 --- a/spec/features/dashboard/project_member_activity_index_spec.rb +++ b/spec/features/dashboard/project_member_activity_index_spec.rb @@ -21,20 +21,20 @@ feature 'Project member activity', feature: true, js: true do context 'when a user joins the project' do before { visit_activities_and_wait_with_event(Event::JOINED) } - it { is_expected.to eq("joined project") } + it { is_expected.to eq("#{user.name} joined project") } end context 'when a user leaves the project' do before { visit_activities_and_wait_with_event(Event::LEFT) } - it { is_expected.to eq("left project") } + it { is_expected.to eq("#{user.name} left project") } end context 'when a users membership expires for the project' do before { visit_activities_and_wait_with_event(Event::EXPIRED) } it "presents the correct message" do - message = "removed due to membership expiration from project" + message = "#{user.name} removed due to membership expiration from project" is_expected.to eq(message) end end |