Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-03 16:00:00 +0300
committerDouwe Maan <douwe@gitlab.com>2015-12-03 16:00:09 +0300
commitf905fd239c79f391ce5a7cc2c5c6648b3d6380e4 (patch)
tree68a1f074611ef664d3873eb19bc249b071ce1ef2 /spec/lib/gitlab/closing_issue_extractor_spec.rb
parent928d131e3974018581d561a7eb11d6524d2e79a2 (diff)
Use URL helpers in specs
Diffstat (limited to 'spec/lib/gitlab/closing_issue_extractor_spec.rb')
-rw-r--r--spec/lib/gitlab/closing_issue_extractor_spec.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/spec/lib/gitlab/closing_issue_extractor_spec.rb b/spec/lib/gitlab/closing_issue_extractor_spec.rb
index e9d7e8c1111..fe1b94a484e 100644
--- a/spec/lib/gitlab/closing_issue_extractor_spec.rb
+++ b/spec/lib/gitlab/closing_issue_extractor_spec.rb
@@ -146,14 +146,14 @@ describe Gitlab::ClosingIssueExtractor do
context "with a cross-project URL" do
it do
- message = "Closes #{Gitlab.config.gitlab.url}/#{project2.to_reference}/issues/#{issue2.iid}"
+ message = "Closes #{urls.namespace_project_issue_url(issue2.project.namespace, issue2.project, issue2)}"
expect(subject.closed_by_message(message)).to eq([issue2])
end
end
context "with an invalid URL" do
it do
- message = "Closes https://google.com/#{project2.to_reference}/issues/#{issue2.iid}"
+ message = "Closes https://google.com#{urls.namespace_project_issue_path(issue2.project.namespace, issue2.project, issue2)}"
expect(subject.closed_by_message(message)).to eq([])
end
end
@@ -208,18 +208,22 @@ describe Gitlab::ClosingIssueExtractor do
end
it "fetches cross-project URL references" do
- message = "Closes #{Gitlab.config.gitlab.url}/#{project2.to_reference}/issues/#{issue2.iid} and #{reference}"
+ message = "Closes #{urls.namespace_project_issue_url(issue2.project.namespace, issue2.project, issue2)} and #{reference}"
expect(subject.closed_by_message(message)).
to match_array([issue, issue2])
end
it "ignores invalid cross-project URL references" do
- message = "Closes https://google.com/#{project2.to_reference}/issues/#{issue2.iid} and #{reference}"
+ message = "Closes https://google.com#{urls.namespace_project_issue_path(issue2.project.namespace, issue2.project, issue2)} and #{reference}"
expect(subject.closed_by_message(message)).
to match_array([issue])
end
end
end
+
+ def urls
+ Gitlab::Application.routes.url_helpers
+ end
end