diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-26 09:27:10 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-26 09:27:10 +0000 |
commit | f2da2df43a6901061a7e6b861c79025644d3b469 (patch) | |
tree | 129fc22b6ed1fe4f11beb236766d3dc4f49b1c3d /spec | |
parent | 8c22045ec0a2401d4629d8e59dadc0180c5a137b (diff) | |
parent | 68fa16a57c17734d08d978556ca4fe79668bdb24 (diff) | |
download | gitlab-ce-f2da2df43a6901061a7e6b861c79025644d3b469.tar.gz |
Merge branch '31280-skip-issueables-without-project' into 'master'
Skip issuable without a project in IssuableExtractor#extract
Closes #31280
See merge request !10906
Diffstat (limited to 'spec')
-rw-r--r-- | spec/factories/issues.rb | 4 | ||||
-rw-r--r-- | spec/lib/banzai/filter/issuable_state_filter_spec.rb | 77 |
2 files changed, 56 insertions, 25 deletions
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb index 0b6977e3b17..f1fd1fd7f73 100644 --- a/spec/factories/issues.rb +++ b/spec/factories/issues.rb @@ -8,6 +8,10 @@ FactoryGirl.define do confidential true end + trait :opened do + state :opened + end + trait :closed do state :closed end diff --git a/spec/lib/banzai/filter/issuable_state_filter_spec.rb b/spec/lib/banzai/filter/issuable_state_filter_spec.rb index 600f3c123ed..9c2399815b9 100644 --- a/spec/lib/banzai/filter/issuable_state_filter_spec.rb +++ b/spec/lib/banzai/filter/issuable_state_filter_spec.rb @@ -6,11 +6,23 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do let(:user) { create(:user) } let(:context) { { current_user: user, issuable_state_filter_enabled: true } } + let(:closed_issue) { create_issue(:closed) } + let(:project) { create(:empty_project, :public) } + let(:other_project) { create(:empty_project, :public) } def create_link(text, data) link_to(text, '', class: 'gfm has-tooltip', data: data) end + def create_issue(state) + create(:issue, state, project: project) + end + + def create_merge_request(state) + create(:merge_request, state, + source_project: project, target_project: project) + end + it 'ignores non-GFM links' do html = %(See <a href="https://google.com/">Google</a>) doc = filter(html, current_user: user) @@ -19,7 +31,6 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do end it 'ignores non-issuable links' do - project = create(:empty_project, :public) link = create_link('text', project: project, reference_type: 'issue') doc = filter(link, context) @@ -27,27 +38,24 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do end it 'ignores issuable links with empty content' do - issue = create(:issue, :closed) - link = create_link('', issue: issue.id, reference_type: 'issue') + link = create_link('', issue: closed_issue.id, reference_type: 'issue') doc = filter(link, context) expect(doc.css('a').last.text).to eq('') end it 'ignores issuable links with custom anchor' do - issue = create(:issue, :closed) - link = create_link('something', issue: issue.id, reference_type: 'issue') + link = create_link('something', issue: closed_issue.id, reference_type: 'issue') doc = filter(link, context) expect(doc.css('a').last.text).to eq('something') end it 'ignores issuable links to specific comments' do - issue = create(:issue, :closed) - link = create_link("#{issue.to_reference} (comment 1)", issue: issue.id, reference_type: 'issue') + link = create_link("#{closed_issue.to_reference} (comment 1)", issue: closed_issue.id, reference_type: 'issue') doc = filter(link, context) - expect(doc.css('a').last.text).to eq("#{issue.to_reference} (comment 1)") + expect(doc.css('a').last.text).to eq("#{closed_issue.to_reference} (comment 1)") end it 'ignores merge request links to diffs tab' do @@ -63,26 +71,36 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do end it 'handles cross project references' do - issue = create(:issue, :closed) - project = create(:empty_project) - link = create_link(issue.to_reference(project), issue: issue.id, reference_type: 'issue') - doc = filter(link, context.merge(project: project)) + link = create_link(closed_issue.to_reference(other_project), issue: closed_issue.id, reference_type: 'issue') + doc = filter(link, context.merge(project: other_project)) - expect(doc.css('a').last.text).to eq("#{issue.to_reference(project)} (closed)") + expect(doc.css('a').last.text).to eq("#{closed_issue.to_reference(other_project)} (closed)") end it 'does not append state when filter is not enabled' do - issue = create(:issue, :closed) - link = create_link('text', issue: issue.id, reference_type: 'issue') + link = create_link('text', issue: closed_issue.id, reference_type: 'issue') context = { current_user: user } doc = filter(link, context) expect(doc.css('a').last.text).to eq('text') end + context 'when project is in pending delete' do + before do + project.update!(pending_delete: true) + end + + it 'does not append issue state' do + link = create_link('text', issue: closed_issue.id, reference_type: 'issue') + doc = filter(link, context) + + expect(doc.css('a').last.text).to eq('text') + end + end + context 'for issue references' do it 'ignores open issue references' do - issue = create(:issue) + issue = create_issue(:opened) link = create_link(issue.to_reference, issue: issue.id, reference_type: 'issue') doc = filter(link, context) @@ -90,7 +108,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do end it 'ignores reopened issue references' do - issue = create(:issue, :reopened) + issue = create_issue(:reopened) link = create_link(issue.to_reference, issue: issue.id, reference_type: 'issue') doc = filter(link, context) @@ -98,70 +116,79 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do end it 'appends state to closed issue references' do - issue = create(:issue, :closed) - link = create_link(issue.to_reference, issue: issue.id, reference_type: 'issue') + link = create_link(closed_issue.to_reference, issue: closed_issue.id, reference_type: 'issue') doc = filter(link, context) - expect(doc.css('a').last.text).to eq("#{issue.to_reference} (closed)") + expect(doc.css('a').last.text).to eq("#{closed_issue.to_reference} (closed)") end end context 'for merge request references' do it 'ignores open merge request references' do - merge_request = create(:merge_request) + merge_request = create_merge_request(:opened) + link = create_link( merge_request.to_reference, merge_request: merge_request.id, reference_type: 'merge_request' ) + doc = filter(link, context) expect(doc.css('a').last.text).to eq(merge_request.to_reference) end it 'ignores reopened merge request references' do - merge_request = create(:merge_request, :reopened) + merge_request = create_merge_request(:reopened) + link = create_link( merge_request.to_reference, merge_request: merge_request.id, reference_type: 'merge_request' ) + doc = filter(link, context) expect(doc.css('a').last.text).to eq(merge_request.to_reference) end it 'ignores locked merge request references' do - merge_request = create(:merge_request, :locked) + merge_request = create_merge_request(:locked) + link = create_link( merge_request.to_reference, merge_request: merge_request.id, reference_type: 'merge_request' ) + doc = filter(link, context) expect(doc.css('a').last.text).to eq(merge_request.to_reference) end it 'appends state to closed merge request references' do - merge_request = create(:merge_request, :closed) + merge_request = create_merge_request(:closed) + link = create_link( merge_request.to_reference, merge_request: merge_request.id, reference_type: 'merge_request' ) + doc = filter(link, context) expect(doc.css('a').last.text).to eq("#{merge_request.to_reference} (closed)") end it 'appends state to merged merge request references' do - merge_request = create(:merge_request, :merged) + merge_request = create_merge_request(:merged) + link = create_link( merge_request.to_reference, merge_request: merge_request.id, reference_type: 'merge_request' ) + doc = filter(link, context) expect(doc.css('a').last.text).to eq("#{merge_request.to_reference} (merged)") |