From 9b925d79c9bfcd1be46bd52e275570a1005a3a79 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 4 Feb 2016 18:36:16 +0100 Subject: WIP - fix and spec for cross reference issue with forks --- spec/services/system_note_service_spec.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'spec') diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index d3364a71022..a3d3147a79b 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -424,6 +424,22 @@ describe SystemNoteService, services: true do to be_falsey end end + + context 'commit from fork' do + let(:author2) { create(:user) } + let(:forked_project) { Projects::ForkService.new(project, author2).execute } + let(:service) { CreateCommitBuildsService.new } + let(:commit2) { forked_project.commit } + + before do + described_class.cross_reference(commit0, commit2, author2) + end + + it 'is falsey when is a fork mentioning an external issue' do + expect(described_class.cross_reference_exists?(commit0, commit2)). + to be_falsey + end + end end include JiraServiceHelper -- cgit v1.2.3 From a64d881bac1e7b846a718ce1f105b7e39f4dd1b3 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Fri, 5 Feb 2016 17:43:05 +0100 Subject: fixed spec - at last! --- spec/services/system_note_service_spec.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'spec') diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index a3d3147a79b..655efa0670b 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -428,15 +428,14 @@ describe SystemNoteService, services: true do context 'commit from fork' do let(:author2) { create(:user) } let(:forked_project) { Projects::ForkService.new(project, author2).execute } - let(:service) { CreateCommitBuildsService.new } let(:commit2) { forked_project.commit } before do - described_class.cross_reference(commit0, commit2, author2) + described_class.cross_reference(noteable, commit2, author2) end it 'is falsey when is a fork mentioning an external issue' do - expect(described_class.cross_reference_exists?(commit0, commit2)). + expect(described_class.cross_reference_exists?(noteable, commit2)). to be_falsey end end -- cgit v1.2.3 From 4089be8fedbe0499108b32dc0c08b6378efc534c Mon Sep 17 00:00:00 2001 From: James Lopez Date: Fri, 12 Feb 2016 18:01:47 +0100 Subject: woo hoo - getting there with the cross-reference issue. Should fix the problem and updated spec --- spec/services/system_note_service_spec.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 655efa0670b..0c063fcb959 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -425,18 +425,20 @@ describe SystemNoteService, services: true do end end - context 'commit from fork' do + context 'commit with cross-reference from fork' do let(:author2) { create(:user) } let(:forked_project) { Projects::ForkService.new(project, author2).execute } let(:commit2) { forked_project.commit } before do - described_class.cross_reference(noteable, commit2, author2) + allow(commit0).to receive(:to_reference) { noteable.project.to_reference + + commit0.class.reference_prefix + commit0.id} + described_class.cross_reference(noteable, commit0, author2) end - it 'is falsey when is a fork mentioning an external issue' do + it 'is true when a fork mentions an external issue' do expect(described_class.cross_reference_exists?(noteable, commit2)). - to be_falsey + to be true end end end -- cgit v1.2.3 From 99a50447a15abb49ae6a3225332f850af78744a9 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Fri, 12 Feb 2016 18:21:01 +0100 Subject: fix rubocop warning --- spec/services/system_note_service_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 0c063fcb959..9b9732ea01f 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -431,8 +431,10 @@ describe SystemNoteService, services: true do let(:commit2) { forked_project.commit } before do - allow(commit0).to receive(:to_reference) { noteable.project.to_reference + - commit0.class.reference_prefix + commit0.id} + allow(commit0).to receive(:to_reference) { + noteable.project.to_reference + + commit0.class.reference_prefix + commit0.id + } described_class.cross_reference(noteable, commit0, author2) end -- cgit v1.2.3 From 11913a762a3ed6514594e6ac6ffe1717dd362ae1 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Tue, 16 Feb 2016 09:01:56 +0100 Subject: updated system note service and spec based on feedback --- spec/services/system_note_service_spec.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'spec') diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 9b9732ea01f..1bdc03af12d 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -431,10 +431,6 @@ describe SystemNoteService, services: true do let(:commit2) { forked_project.commit } before do - allow(commit0).to receive(:to_reference) { - noteable.project.to_reference + - commit0.class.reference_prefix + commit0.id - } described_class.cross_reference(noteable, commit0, author2) end -- cgit v1.2.3