From 566b37ce2188bf9da87aa7ccabece7e92119e790 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 18 May 2017 19:32:22 +0800 Subject: Add backward compatible routes for builds --- spec/features/projects/jobs_spec.rb | 548 ++++++++++++++++++++++++++++++++++++ 1 file changed, 548 insertions(+) create mode 100644 spec/features/projects/jobs_spec.rb (limited to 'spec/features/projects/jobs_spec.rb') diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb new file mode 100644 index 00000000000..b04c740dfc8 --- /dev/null +++ b/spec/features/projects/jobs_spec.rb @@ -0,0 +1,548 @@ +require 'spec_helper' +require 'tempfile' + +feature 'Jobs', :feature do + let(:user) { create(:user) } + let(:user_access_level) { :developer } + let(:project) { create(:project) } + let(:pipeline) { create(:ci_pipeline, project: project) } + + let(:build) { create(:ci_build, :trace, pipeline: pipeline) } + let(:build2) { create(:ci_build) } + + let(:artifacts_file) do + fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') + end + + before do + project.team << [user, user_access_level] + login_as(user) + end + + describe "GET /:project/jobs" do + let!(:build) { create(:ci_build, pipeline: pipeline) } + + context "Pending scope" do + before do + visit namespace_project_jobs_path(project.namespace, project, scope: :pending) + end + + it "shows Pending tab jobs" do + expect(page).to have_link 'Cancel running' + expect(page).to have_selector('.nav-links li.active', text: 'Pending') + expect(page).to have_content build.short_sha + expect(page).to have_content build.ref + expect(page).to have_content build.name + end + end + + context "Running scope" do + before do + build.run! + visit namespace_project_jobs_path(project.namespace, project, scope: :running) + end + + it "shows Running tab jobs" do + expect(page).to have_selector('.nav-links li.active', text: 'Running') + expect(page).to have_link 'Cancel running' + expect(page).to have_content build.short_sha + expect(page).to have_content build.ref + expect(page).to have_content build.name + end + end + + context "Finished scope" do + before do + build.run! + visit namespace_project_jobs_path(project.namespace, project, scope: :finished) + end + + it "shows Finished tab jobs" do + expect(page).to have_selector('.nav-links li.active', text: 'Finished') + expect(page).to have_content 'No jobs to show' + expect(page).to have_link 'Cancel running' + end + end + + context "All jobs" do + before do + project.builds.running_or_pending.each(&:success) + visit namespace_project_jobs_path(project.namespace, project) + end + + it "shows All tab jobs" do + expect(page).to have_selector('.nav-links li.active', text: 'All') + expect(page).to have_content build.short_sha + expect(page).to have_content build.ref + expect(page).to have_content build.name + expect(page).not_to have_link 'Cancel running' + end + end + + context "when visiting old URL" do + let(:jobs_url) do + namespace_project_jobs_path(project.namespace, project) + end + + before do + visit jobs_url.sub('jobs', 'builds') + end + + it "redirects to new URL" do + expect(page.current_path).to eq(jobs_url) + end + end + end + + describe "POST /:project/jobs/:id/cancel_all" do + before do + build.run! + visit namespace_project_jobs_path(project.namespace, project) + click_link "Cancel running" + end + + it 'shows all necessary content' do + expect(page).to have_selector('.nav-links li.active', text: 'All') + expect(page).to have_content 'canceled' + expect(page).to have_content build.short_sha + expect(page).to have_content build.ref + expect(page).to have_content build.name + expect(page).not_to have_link 'Cancel running' + end + end + + describe "GET /:project/jobs/:id" do + context "Job from project" do + before do + visit namespace_project_job_path(project.namespace, project, build) + end + + it 'shows commit`s data' do + expect(page.status_code).to eq(200) + expect(page).to have_content pipeline.sha[0..7] + expect(page).to have_content pipeline.git_commit_message + expect(page).to have_content pipeline.git_author_name + end + + it 'shows active build' do + expect(page).to have_selector('.build-job.active') + end + end + + context "Job from other project" do + before do + visit namespace_project_job_path(project.namespace, project, build2) + end + + it { expect(page.status_code).to eq(404) } + end + + context "Download artifacts" do + before do + build.update_attributes(artifacts_file: artifacts_file) + visit namespace_project_job_path(project.namespace, project, build) + end + + it 'has button to download artifacts' do + expect(page).to have_content 'Download' + end + end + + context 'Artifacts expire date' do + before do + build.update_attributes(artifacts_file: artifacts_file, + artifacts_expire_at: expire_at) + + visit namespace_project_job_path(project.namespace, project, build) + end + + context 'no expire date defined' do + let(:expire_at) { nil } + + it 'does not have the Keep button' do + expect(page).not_to have_content 'Keep' + end + end + + context 'when expire date is defined' do + let(:expire_at) { Time.now + 7.days } + + context 'when user has ability to update job' do + it 'keeps artifacts when keep button is clicked' do + expect(page).to have_content 'The artifacts will be removed' + + click_link 'Keep' + + expect(page).to have_no_link 'Keep' + expect(page).to have_no_content 'The artifacts will be removed' + end + end + + context 'when user does not have ability to update job' do + let(:user_access_level) { :guest } + + it 'does not have keep button' do + expect(page).to have_no_link 'Keep' + end + end + end + + context 'when artifacts expired' do + let(:expire_at) { Time.now - 7.days } + + it 'does not have the Keep button' do + expect(page).to have_content 'The artifacts were removed' + expect(page).not_to have_link 'Keep' + end + end + end + + context "when visiting old URL" do + let(:job_url) do + namespace_project_job_path(project.namespace, project, build) + end + + before do + visit job_url.sub('jobs', 'builds') + end + + it "redirects to new URL" do + expect(page.current_path).to eq(job_url) + end + end + + feature 'Raw trace' do + before do + build.run! + + visit namespace_project_job_path(project.namespace, project, build) + end + + it do + expect(page).to have_link 'Raw' + end + end + + feature 'HTML trace', :js do + before do + build.run! + + visit namespace_project_job_path(project.namespace, project, build) + end + + context 'when job has an initial trace' do + it 'loads job trace' do + expect(page).to have_content 'BUILD TRACE' + + build.trace.write do |stream| + stream.append(' and more trace', 11) + end + + expect(page).to have_content 'BUILD TRACE and more trace' + end + end + end + + feature 'Variables' do + let(:trigger_request) { create(:ci_trigger_request_with_variables) } + + let(:build) do + create :ci_build, pipeline: pipeline, trigger_request: trigger_request + end + + before do + visit namespace_project_job_path(project.namespace, project, build) + end + + it 'shows variable key and value after click', js: true do + expect(page).to have_css('.reveal-variables') + expect(page).not_to have_css('.js-build-variable') + expect(page).not_to have_css('.js-build-value') + + click_button 'Reveal Variables' + + expect(page).not_to have_css('.reveal-variables') + expect(page).to have_selector('.js-build-variable', text: 'TRIGGER_KEY_1') + expect(page).to have_selector('.js-build-value', text: 'TRIGGER_VALUE_1') + end + end + + context 'when job starts environment' do + let(:environment) { create(:environment, project: project) } + let(:pipeline) { create(:ci_pipeline, project: project) } + + context 'job is successfull and has deployment' do + let(:deployment) { create(:deployment) } + let(:build) { create(:ci_build, :success, environment: environment.name, deployments: [deployment], pipeline: pipeline) } + + it 'shows a link for the job' do + visit namespace_project_job_path(project.namespace, project, build) + + expect(page).to have_link environment.name + end + end + + context 'job is complete and not successfull' do + let(:build) { create(:ci_build, :failed, environment: environment.name, pipeline: pipeline) } + + it 'shows a link for the job' do + visit namespace_project_job_path(project.namespace, project, build) + + expect(page).to have_link environment.name + end + end + + context 'job creates a new deployment' do + let!(:deployment) { create(:deployment, environment: environment, sha: project.commit.id) } + let(:build) { create(:ci_build, :success, environment: environment.name, pipeline: pipeline) } + + it 'shows a link to latest deployment' do + visit namespace_project_job_path(project.namespace, project, build) + + expect(page).to have_link('latest deployment') + end + end + end + end + + describe "POST /:project/builds/:id/cancel" do + context "Job from project" do + before do + build.run! + visit namespace_project_job_path(project.namespace, project, build) + click_link "Cancel" + end + + it 'loads the page and shows all needed controls' do + expect(page.status_code).to eq(200) + expect(page).to have_content 'canceled' + expect(page).to have_content 'Retry' + end + end + + context "Job from other project" do + before do + build.run! + visit namespace_project_job_path(project.namespace, project, build) + page.driver.post(cancel_namespace_project_job_path(project.namespace, project, build2)) + end + + it { expect(page.status_code).to eq(404) } + end + end + + describe "POST /:project/builds/:id/retry" do + context "Job from project" do + before do + build.run! + visit namespace_project_job_path(project.namespace, project, build) + click_link 'Cancel' + page.within('.build-header') do + click_link 'Retry job' + end + end + + it 'shows the right status and buttons' do + expect(page).to have_http_status(200) + expect(page).to have_content 'pending' + page.within('aside.right-sidebar') do + expect(page).to have_content 'Cancel' + end + end + end + + context "Build from other project" do + before do + build.run! + visit namespace_project_job_path(project.namespace, project, build) + click_link 'Cancel' + page.driver.post(retry_namespace_project_job_path(project.namespace, project, build2)) + end + + it { expect(page).to have_http_status(404) } + end + + context "Build that current user is not allowed to retry" do + before do + build.run! + build.cancel! + project.update(visibility_level: Gitlab::VisibilityLevel::PUBLIC) + + logout_direct + login_with(create(:user)) + visit namespace_project_job_path(project.namespace, project, build) + end + + it 'does not show the Retry button' do + page.within('aside.right-sidebar') do + expect(page).not_to have_content 'Retry' + end + end + end + end + + describe "GET /:project/builds/:id/download" do + before do + build.update_attributes(artifacts_file: artifacts_file) + visit namespace_project_job_path(project.namespace, project, build) + click_link 'Download' + end + + context "Build from other project" do + before do + build2.update_attributes(artifacts_file: artifacts_file) + visit download_namespace_project_job_artifacts_path(project.namespace, project, build2) + end + + it { expect(page.status_code).to eq(404) } + end + end + + describe 'GET /:project/builds/:id/raw' do + context 'access source' do + context 'build from project' do + before do + Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile') + build.run! + visit namespace_project_job_path(project.namespace, project, build) + page.within('.js-build-sidebar') { click_link 'Raw' } + end + + it 'sends the right headers' do + expect(page.status_code).to eq(200) + expect(page.response_headers['Content-Type']).to eq('text/plain; charset=utf-8') + expect(page.response_headers['X-Sendfile']).to eq(build.trace.send(:current_path)) + end + end + + context 'build from other project' do + before do + Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile') + build2.run! + visit raw_namespace_project_job_path(project.namespace, project, build2) + end + + it 'sends the right headers' do + expect(page.status_code).to eq(404) + end + end + end + + context 'storage form' do + let(:existing_file) { Tempfile.new('existing-trace-file').path } + + before do + Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile') + + build.run! + + allow_any_instance_of(Gitlab::Ci::Trace).to receive(:paths) + .and_return(paths) + + visit namespace_project_job_path(project.namespace, project, build) + end + + context 'when build has trace in file' do + let(:paths) do + [existing_file] + end + + before do + page.within('.js-build-sidebar') { click_link 'Raw' } + end + + it 'sends the right headers' do + expect(page.status_code).to eq(200) + expect(page.response_headers['Content-Type']).to eq('text/plain; charset=utf-8') + expect(page.response_headers['X-Sendfile']).to eq(existing_file) + end + end + + context 'when build has trace in DB' do + let(:paths) { [] } + + it 'sends the right headers' do + expect(page.status_code).not_to have_link('Raw') + end + end + end + + context "when visiting old URL" do + let(:raw_job_url) do + raw_namespace_project_job_path(project.namespace, project, build) + end + + before do + visit raw_job_url.sub('jobs', 'builds') + end + + it "redirects to new URL" do + expect(page.current_path).to eq(raw_job_url) + end + end + end + + describe "GET /:project/builds/:id/trace.json" do + context "Build from project" do + before do + visit trace_namespace_project_job_path(project.namespace, project, build, format: :json) + end + + it { expect(page.status_code).to eq(200) } + end + + context "Build from other project" do + before do + visit trace_namespace_project_job_path(project.namespace, project, build2, format: :json) + end + + it { expect(page.status_code).to eq(404) } + end + + context "when visiting old URL" do + let(:trace_job_url) do + trace_namespace_project_job_path(project.namespace, project, build,format: :json) + end + + before do + visit trace_job_url.sub('jobs', 'builds') + end + + it "redirects to new URL" do + expect(page.current_path).to eq(trace_job_url) + end + end + end + + describe "GET /:project/builds/:id/status" do + context "Build from project" do + before do + visit status_namespace_project_job_path(project.namespace, project, build) + end + + it { expect(page.status_code).to eq(200) } + end + + context "Build from other project" do + before do + visit status_namespace_project_job_path(project.namespace, project, build2) + end + + it { expect(page.status_code).to eq(404) } + end + + context "when visiting old URL" do + let(:status_job_url) do + status_namespace_project_job_path(project.namespace, project, build) + end + + before do + visit status_job_url.sub('jobs', 'builds') + end + + it "redirects to new URL" do + expect(page.current_path).to eq(status_job_url) + end + end + end +end -- cgit v1.2.1 From b8ff4b26b5f38e2fcdca487c5b7fc7d19af9ac61 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 18 May 2017 20:57:05 +0800 Subject: Disable rubocop hash check for blocks --- spec/features/projects/jobs_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/features/projects/jobs_spec.rb') diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index b04c740dfc8..bd1bf64247f 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -501,7 +501,7 @@ feature 'Jobs', :feature do context "when visiting old URL" do let(:trace_job_url) do - trace_namespace_project_job_path(project.namespace, project, build,format: :json) + trace_namespace_project_job_path(project.namespace, project, build, format: :json) end before do -- cgit v1.2.1 From 876acc7e0d654ebc89df3c596cc504334a37f7d8 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Fri, 19 May 2017 14:59:05 +0800 Subject: Separate artifacts from builds, reusing artifacts_action_path --- spec/features/projects/jobs_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'spec/features/projects/jobs_spec.rb') diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index bd1bf64247f..984d9bdb58c 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -482,8 +482,8 @@ feature 'Jobs', :feature do end end - describe "GET /:project/builds/:id/trace.json" do - context "Build from project" do + describe "GET /:project/jobs/:id/trace.json" do + context "Job from project" do before do visit trace_namespace_project_job_path(project.namespace, project, build, format: :json) end @@ -491,7 +491,7 @@ feature 'Jobs', :feature do it { expect(page.status_code).to eq(200) } end - context "Build from other project" do + context "Job from other project" do before do visit trace_namespace_project_job_path(project.namespace, project, build2, format: :json) end @@ -514,8 +514,8 @@ feature 'Jobs', :feature do end end - describe "GET /:project/builds/:id/status" do - context "Build from project" do + describe "GET /:project/jobs/:id/status" do + context "Job from project" do before do visit status_namespace_project_job_path(project.namespace, project, build) end @@ -523,7 +523,7 @@ feature 'Jobs', :feature do it { expect(page.status_code).to eq(200) } end - context "Build from other project" do + context "Job from other project" do before do visit status_namespace_project_job_path(project.namespace, project, build2) end -- cgit v1.2.1 From 524c947eafbc4b710ac862c4e90801b2777d49dc Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 23 May 2017 23:42:26 +0800 Subject: Add checks before redirect, remove status/trace compatible urls, which were for javascripts --- spec/features/projects/jobs_spec.rb | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'spec/features/projects/jobs_spec.rb') diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index 984d9bdb58c..f8d7b9eccb1 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -498,20 +498,6 @@ feature 'Jobs', :feature do it { expect(page.status_code).to eq(404) } end - - context "when visiting old URL" do - let(:trace_job_url) do - trace_namespace_project_job_path(project.namespace, project, build, format: :json) - end - - before do - visit trace_job_url.sub('jobs', 'builds') - end - - it "redirects to new URL" do - expect(page.current_path).to eq(trace_job_url) - end - end end describe "GET /:project/jobs/:id/status" do @@ -530,19 +516,5 @@ feature 'Jobs', :feature do it { expect(page.status_code).to eq(404) } end - - context "when visiting old URL" do - let(:status_job_url) do - status_namespace_project_job_path(project.namespace, project, build) - end - - before do - visit status_job_url.sub('jobs', 'builds') - end - - it "redirects to new URL" do - expect(page.current_path).to eq(status_job_url) - end - end end end -- cgit v1.2.1 From c94db0c2906c5da49acc9addb976b64fd7c7b256 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Fri, 26 May 2017 21:55:29 +0800 Subject: Use - as the prefix so we don't conflict with namespaces The decision was made around: https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641 --- spec/features/projects/jobs_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/features/projects/jobs_spec.rb') diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index f8d7b9eccb1..ee968abff6f 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -85,7 +85,7 @@ feature 'Jobs', :feature do end before do - visit jobs_url.sub('jobs', 'builds') + visit jobs_url.sub('/-/jobs', '/builds') end it "redirects to new URL" do @@ -203,7 +203,7 @@ feature 'Jobs', :feature do end before do - visit job_url.sub('jobs', 'builds') + visit job_url.sub('/-/jobs', '/builds') end it "redirects to new URL" do @@ -473,7 +473,7 @@ feature 'Jobs', :feature do end before do - visit raw_job_url.sub('jobs', 'builds') + visit raw_job_url.sub('/-/jobs', '/builds') end it "redirects to new URL" do -- cgit v1.2.1 From 258cdd14b557b96c5340ea91c6915b8787ce1b1e Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 31 May 2017 22:04:38 +0800 Subject: Update jobs_spec for changes from builds_spec --- spec/features/projects/jobs_spec.rb | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'spec/features/projects/jobs_spec.rb') diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index ee968abff6f..2ed5d9e165a 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -219,7 +219,7 @@ feature 'Jobs', :feature do end it do - expect(page).to have_link 'Raw' + expect(page).to have_css('.js-raw-link') end end @@ -282,7 +282,7 @@ feature 'Jobs', :feature do end end - context 'job is complete and not successfull' do + context 'job is complete and not successful' do let(:build) { create(:ci_build, :failed, environment: environment.name, pipeline: pipeline) } it 'shows a link for the job' do @@ -305,7 +305,7 @@ feature 'Jobs', :feature do end end - describe "POST /:project/builds/:id/cancel" do + describe "POST /:project/jobs/:id/cancel" do context "Job from project" do before do build.run! @@ -331,7 +331,7 @@ feature 'Jobs', :feature do end end - describe "POST /:project/builds/:id/retry" do + describe "POST /:project/jobs/:id/retry" do context "Job from project" do before do build.run! @@ -381,7 +381,7 @@ feature 'Jobs', :feature do end end - describe "GET /:project/builds/:id/download" do + describe "GET /:project/jobs/:id/download" do before do build.update_attributes(artifacts_file: artifacts_file) visit namespace_project_job_path(project.namespace, project, build) @@ -398,14 +398,14 @@ feature 'Jobs', :feature do end end - describe 'GET /:project/builds/:id/raw' do + describe 'GET /:project/jobs/:id/raw', :js do context 'access source' do context 'build from project' do before do - Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile') + Capybara.current_session.driver.headers = { 'X-Sendfile-Type' => 'X-Sendfile' } build.run! visit namespace_project_job_path(project.namespace, project, build) - page.within('.js-build-sidebar') { click_link 'Raw' } + find('.js-raw-link-controller').click() end it 'sends the right headers' do @@ -415,9 +415,9 @@ feature 'Jobs', :feature do end end - context 'build from other project' do + context 'job from other project' do before do - Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile') + Capybara.current_session.driver.headers = { 'X-Sendfile-Type' => 'X-Sendfile' } build2.run! visit raw_namespace_project_job_path(project.namespace, project, build2) end @@ -432,7 +432,7 @@ feature 'Jobs', :feature do let(:existing_file) { Tempfile.new('existing-trace-file').path } before do - Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile') + Capybara.current_session.driver.headers = { 'X-Sendfile-Type' => 'X-Sendfile' } build.run! @@ -442,13 +442,13 @@ feature 'Jobs', :feature do visit namespace_project_job_path(project.namespace, project, build) end - context 'when build has trace in file' do + context 'when build has trace in file', :js do let(:paths) do [existing_file] end before do - page.within('.js-build-sidebar') { click_link 'Raw' } + find('.js-raw-link-controller').click() end it 'sends the right headers' do @@ -462,7 +462,7 @@ feature 'Jobs', :feature do let(:paths) { [] } it 'sends the right headers' do - expect(page.status_code).not_to have_link('Raw') + expect(page.status_code).not_to have_selector('.js-raw-link-controller') end end end @@ -483,7 +483,7 @@ feature 'Jobs', :feature do end describe "GET /:project/jobs/:id/trace.json" do - context "Job from project" do + context "Build from project" do before do visit trace_namespace_project_job_path(project.namespace, project, build, format: :json) end @@ -491,7 +491,7 @@ feature 'Jobs', :feature do it { expect(page.status_code).to eq(200) } end - context "Job from other project" do + context "Build from other project" do before do visit trace_namespace_project_job_path(project.namespace, project, build2, format: :json) end @@ -501,7 +501,7 @@ feature 'Jobs', :feature do end describe "GET /:project/jobs/:id/status" do - context "Job from project" do + context "Build from project" do before do visit status_namespace_project_job_path(project.namespace, project, build) end @@ -509,7 +509,7 @@ feature 'Jobs', :feature do it { expect(page.status_code).to eq(200) } end - context "Job from other project" do + context "Build from other project" do before do visit status_namespace_project_job_path(project.namespace, project, build2) end -- cgit v1.2.1 From 61227393dc1bc8240b7e9413a613f7aacdaed2c2 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 31 May 2017 23:00:30 +0800 Subject: Rename the other jobs --- spec/features/projects/jobs_spec.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'spec/features/projects/jobs_spec.rb') diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index 2ed5d9e165a..0eda46649db 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -351,7 +351,7 @@ feature 'Jobs', :feature do end end - context "Build from other project" do + context "Job from other project" do before do build.run! visit namespace_project_job_path(project.namespace, project, build) @@ -362,7 +362,7 @@ feature 'Jobs', :feature do it { expect(page).to have_http_status(404) } end - context "Build that current user is not allowed to retry" do + context "Job that current user is not allowed to retry" do before do build.run! build.cancel! @@ -400,7 +400,7 @@ feature 'Jobs', :feature do describe 'GET /:project/jobs/:id/raw', :js do context 'access source' do - context 'build from project' do + context 'job from project' do before do Capybara.current_session.driver.headers = { 'X-Sendfile-Type' => 'X-Sendfile' } build.run! @@ -458,7 +458,7 @@ feature 'Jobs', :feature do end end - context 'when build has trace in DB' do + context 'when job has trace in DB' do let(:paths) { [] } it 'sends the right headers' do @@ -483,7 +483,7 @@ feature 'Jobs', :feature do end describe "GET /:project/jobs/:id/trace.json" do - context "Build from project" do + context "Job from project" do before do visit trace_namespace_project_job_path(project.namespace, project, build, format: :json) end @@ -491,7 +491,7 @@ feature 'Jobs', :feature do it { expect(page.status_code).to eq(200) } end - context "Build from other project" do + context "Job from other project" do before do visit trace_namespace_project_job_path(project.namespace, project, build2, format: :json) end @@ -501,7 +501,7 @@ feature 'Jobs', :feature do end describe "GET /:project/jobs/:id/status" do - context "Build from project" do + context "Job from project" do before do visit status_namespace_project_job_path(project.namespace, project, build) end @@ -509,7 +509,7 @@ feature 'Jobs', :feature do it { expect(page.status_code).to eq(200) } end - context "Build from other project" do + context "Job from other project" do before do visit status_namespace_project_job_path(project.namespace, project, build2) end -- cgit v1.2.1