From 0b9fbb1d51bbbf205df507eb29296594529539c5 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Thu, 28 Feb 2019 12:19:35 +0200 Subject: Update activity spec --- spec/features/dashboard/activity_spec.rb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/features/dashboard/activity_spec.rb b/spec/features/dashboard/activity_spec.rb index bf91dc121d8..a35494065fe 100644 --- a/spec/features/dashboard/activity_spec.rb +++ b/spec/features/dashboard/activity_spec.rb @@ -39,6 +39,8 @@ describe 'Dashboard > Activity' do event end + let(:issue) { create(:issue, project: project) } + let!(:merged_event) do create(:event, :merged, project: project, target: merge_request, author: user) end @@ -59,6 +61,10 @@ describe 'Dashboard > Activity' do create(:event, :closed, project: project, target: milestone, author: user) end + let!(:issue_event) do + create(:event, :created, project: project, target: issue, author: user) + end + before do project.add_maintainer(user) @@ -74,6 +80,8 @@ describe 'Dashboard > Activity' do expect(page).to have_content('closed') expect(page).to have_content('commented on') expect(page).to have_content('closed milestone') + expect(page).to have_content('opened issue') + end end @@ -87,6 +95,7 @@ describe 'Dashboard > Activity' do expect(page).not_to have_content('accepted') expect(page).not_to have_content('closed') expect(page).not_to have_content('commented on') + expect(page).not_to have_content('opened issue') end end @@ -100,6 +109,8 @@ describe 'Dashboard > Activity' do expect(page).to have_content('accepted') expect(page).not_to have_content('closed') expect(page).not_to have_content('commented on') + expect(page).not_to have_content('opened issue') + end end @@ -111,9 +122,10 @@ describe 'Dashboard > Activity' do expect(page).not_to have_content('pushed new branch') expect(page).not_to have_content('joined') expect(page).not_to have_content('accepted') - expect(page).to have_content('closed') + expect(page).not_to have_content('closed') expect(page).not_to have_content('commented on') - expect(page).to have_content('closed milestone') + expect(page).not_to have_content('closed milestone') + expect(page).to have_content('opened issue') end end @@ -127,6 +139,7 @@ describe 'Dashboard > Activity' do expect(page).not_to have_content('accepted') expect(page).not_to have_content('closed') expect(page).to have_content('commented on') + expect(page).not_to have_content('opened issue') end end @@ -140,6 +153,7 @@ describe 'Dashboard > Activity' do expect(page).not_to have_content('accepted') expect(page).not_to have_content('closed') expect(page).not_to have_content('commented on') + expect(page).not_to have_content('opened issue') end end @@ -155,6 +169,7 @@ describe 'Dashboard > Activity' do expect(page).not_to have_content('accepted') expect(page).not_to have_content('closed') expect(page).not_to have_content('commented on') + expect(page).not_to have_content('opened issue') end end end -- cgit v1.2.3 From d9a6ba78ae3a1b4c909810fbff6edb39ebd34949 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Thu, 28 Feb 2019 12:32:01 +0200 Subject: Update event filter spec --- spec/lib/event_filter_spec.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'spec') diff --git a/spec/lib/event_filter_spec.rb b/spec/lib/event_filter_spec.rb index 30016da6828..117983a6b47 100644 --- a/spec/lib/event_filter_spec.rb +++ b/spec/lib/event_filter_spec.rb @@ -26,10 +26,7 @@ describe EventFilter do set(:push_event) { create(:push_event, project: public_project) } set(:merged_event) { create(:event, :merged, project: public_project, target: public_project) } - set(:created_event) { create(:event, :created, project: public_project, target: public_project) } - set(:updated_event) { create(:event, :updated, project: public_project, target: public_project) } - set(:closed_event) { create(:event, :closed, project: public_project, target: public_project) } - set(:reopened_event) { create(:event, :reopened, project: public_project, target: public_project) } + set(:issue_event) { create(:event, :created, project: public_project, target: create(:issue, project: public_project)) } set(:comments_event) { create(:event, :commented, project: public_project, target: public_project) } set(:joined_event) { create(:event, :joined, project: public_project, target: public_project) } set(:left_event) { create(:event, :left, project: public_project, target: public_project) } @@ -56,7 +53,7 @@ describe EventFilter do let(:filter) { described_class::ISSUE } it 'filters issue events only' do - expect(filtered_events).to contain_exactly(created_event, updated_event, closed_event, reopened_event) + expect(filtered_events).to contain_exactly(issue_event) end end -- cgit v1.2.3 From c2f180e72fff44516302ebb10f8b0a357463096b Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Thu, 28 Feb 2019 13:50:06 +0200 Subject: Remove extra empty lines in activity spec --- spec/features/dashboard/activity_spec.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'spec') diff --git a/spec/features/dashboard/activity_spec.rb b/spec/features/dashboard/activity_spec.rb index a35494065fe..c55dc4523f7 100644 --- a/spec/features/dashboard/activity_spec.rb +++ b/spec/features/dashboard/activity_spec.rb @@ -81,7 +81,6 @@ describe 'Dashboard > Activity' do expect(page).to have_content('commented on') expect(page).to have_content('closed milestone') expect(page).to have_content('opened issue') - end end @@ -110,7 +109,6 @@ describe 'Dashboard > Activity' do expect(page).not_to have_content('closed') expect(page).not_to have_content('commented on') expect(page).not_to have_content('opened issue') - end end -- cgit v1.2.3 From f40aecddb763cf0b9a37a8e9aa00229e60bd5e2b Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Thu, 7 Mar 2019 12:19:06 +0200 Subject: Update event filter spec to included removed event types --- spec/lib/event_filter_spec.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/lib/event_filter_spec.rb b/spec/lib/event_filter_spec.rb index 117983a6b47..6648e141b7a 100644 --- a/spec/lib/event_filter_spec.rb +++ b/spec/lib/event_filter_spec.rb @@ -26,7 +26,10 @@ describe EventFilter do set(:push_event) { create(:push_event, project: public_project) } set(:merged_event) { create(:event, :merged, project: public_project, target: public_project) } - set(:issue_event) { create(:event, :created, project: public_project, target: create(:issue, project: public_project)) } + set(:created_event) { create(:event, :created, project: public_project, target: create(:issue, project: public_project)) } + set(:updated_event) { create(:event, :updated, project: public_project, target: create(:issue, project: public_project)) } + set(:closed_event) { create(:event, :closed, project: public_project, target: create(:issue, project: public_project)) } + set(:reopened_event) { create(:event, :reopened, project: public_project, target: create(:issue, project: public_project)) } set(:comments_event) { create(:event, :commented, project: public_project, target: public_project) } set(:joined_event) { create(:event, :joined, project: public_project, target: public_project) } set(:left_event) { create(:event, :left, project: public_project, target: public_project) } @@ -53,7 +56,7 @@ describe EventFilter do let(:filter) { described_class::ISSUE } it 'filters issue events only' do - expect(filtered_events).to contain_exactly(issue_event) + expect(filtered_events).to contain_exactly(created_event, updated_event, closed_event, reopened_event) end end -- cgit v1.2.3