summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-09-12 11:28:43 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-09-12 11:28:43 +0200
commitd63aebb7ec18617c097f52a4cfc8ffd3300489d1 (patch)
treea8381b8274029082bb89f8987fb6a81dba8df741
parentda0df236543beac96f845cacdfb9d77d69cc23cf (diff)
downloadgitlab-ce-d63aebb7ec18617c097f52a4cfc8ffd3300489d1.tar.gz
-rw-r--r--features/steps/project/redirects.rb1
-rw-r--r--spec/features/projects/jobs_spec.rb4
2 files changed, 3 insertions, 2 deletions
diff --git a/features/steps/project/redirects.rb b/features/steps/project/redirects.rb
index ab6b464a405..9ce86ca45d0 100644
--- a/features/steps/project/redirects.rb
+++ b/features/steps/project/redirects.rb
@@ -17,6 +17,7 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
end
step 'I should see project "Community" home page' do
+ Gitlab.config.gitlab.should_receive(:host).and_return("www.example.com")
page.within '.breadcrumbs .breadcrumb-item-text' do
expect(page).to have_content 'Community'
end
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 76630017b54..a4ed589f3de 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -165,8 +165,8 @@ feature 'Jobs' do
it 'links to issues/new with the title and description filled in' do
button_title = "Job Failed ##{job.id}"
- job_url = project_job_url(project, job)
- options = { issue: { title: button_title, description: "Job [##{job.id}](#{ job_url}) failed for #{job.sha}:\n" } }
+ job_url = project_job_path(project, job)
+ options = { issue: { title: button_title, description: "Job [##{job.id}](#{job_url}) failed for #{job.sha}:\n" } }
href = new_project_issue_path(project, options)