summaryrefslogtreecommitdiff
path: root/spec/features/projects/activity
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-09-06 12:07:33 +0200
committerRémy Coutable <remy@rymai.me>2018-09-26 18:34:26 +0200
commitd2afddfeff29c15cad737db4898664381ce0f985 (patch)
tree3fd5b7f6329bf4fe4ce9851e8bc16e92def8d205 /spec/features/projects/activity
parent65cf805278c1d865ee0543508de92d5f4ecae4f0 (diff)
downloadgitlab-ce-1801-allow-event_filter-to-be-set-in-the-url.tar.gz
Refactor EventFilter and increase its test coverage1801-allow-event_filter-to-be-set-in-the-url
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/features/projects/activity')
-rw-r--r--spec/features/projects/activity/user_sees_activity_spec.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/spec/features/projects/activity/user_sees_activity_spec.rb b/spec/features/projects/activity/user_sees_activity_spec.rb
index e0248911b5f..ebaa137772d 100644
--- a/spec/features/projects/activity/user_sees_activity_spec.rb
+++ b/spec/features/projects/activity/user_sees_activity_spec.rb
@@ -3,8 +3,10 @@ require 'spec_helper'
describe 'Projects > Activity > User sees activity' do
let(:project) { create(:project, :repository, :public) }
let(:user) { project.creator }
+ let(:issue) { create(:issue, project: project) }
before do
+ create(:event, :created, project: project, target: issue, author: user)
event = create(:push_event, project: project, author: user)
create(:push_event_payload,
event: event,
@@ -12,10 +14,18 @@ describe 'Projects > Activity > User sees activity' do
commit_to: '6d394385cf567f80a8fd85055db1ab4c5295806f',
ref: 'fix',
commit_count: 1)
- visit activity_project_path(project)
end
it 'shows the last push in the activity page', :js do
+ visit activity_project_path(project)
+
expect(page).to have_content "#{user.name} pushed new branch fix"
end
+
+ it 'allows to filter event with the "event_filter=issue" URL param', :js do
+ visit activity_project_path(project, event_filter: 'issue')
+
+ expect(page).not_to have_content "#{user.name} pushed new branch fix"
+ expect(page).to have_content "#{user.name} opened issue #{issue.to_reference}"
+ end
end