diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-17 13:34:19 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-10-17 13:34:19 +0300 |
commit | 5ed91cf81bcc459ad65357c128b955e10ddce284 (patch) | |
tree | 77c4b367c9c2d1a34a6eb1dafeb1040cb97904a3 /spec/features | |
parent | 712f41e15cb61b8804f41afddfbe5f57106248a1 (diff) |
Resolve "Integrate new vue+vuex code base with new API and remove old haml code"
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/projects/jobs/permissions_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/jobs/user_browses_job_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/jobs_spec.rb | 22 |
3 files changed, 14 insertions, 12 deletions
diff --git a/spec/features/projects/jobs/permissions_spec.rb b/spec/features/projects/jobs/permissions_spec.rb index e639f0cf82e..6ce37297a7e 100644 --- a/spec/features/projects/jobs/permissions_spec.rb +++ b/spec/features/projects/jobs/permissions_spec.rb @@ -67,7 +67,7 @@ describe 'Project Jobs Permissions' do it_behaves_like 'recent job page details responds with status', 200 do it 'renders job details', :js do expect(page).to have_content "Job ##{job.id}" - expect(page).to have_css '#build-trace' + expect(page).to have_css '.js-build-trace' end end diff --git a/spec/features/projects/jobs/user_browses_job_spec.rb b/spec/features/projects/jobs/user_browses_job_spec.rb index fc7b78ac21f..908c616f2fc 100644 --- a/spec/features/projects/jobs/user_browses_job_spec.rb +++ b/spec/features/projects/jobs/user_browses_job_spec.rb @@ -20,7 +20,7 @@ describe 'User browses a job', :js do wait_for_requests expect(page).to have_content("Job ##{build.id}") - expect(page).to have_css('#build-trace') + expect(page).to have_css('.js-build-trace') # scroll to the top of the page first execute_script "window.scrollTo(0,0)" diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index a3a301504ff..7f5c3ff6ed8 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -294,7 +294,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do end end - describe 'Raw trace' do + describe 'Raw trace', :js do before do job.run! @@ -302,7 +302,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do end it do - expect(page).to have_css('.js-raw-link') + wait_for_all_requests + expect(page).to have_css('.js-raw-link-controller') end end @@ -636,7 +637,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do end end - context 'Canceled job' do + context 'Canceled job', :js do context 'with log' do let(:job) { create(:ci_build, :canceled, :trace_artifact, pipeline: pipeline) } @@ -645,7 +646,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do end it 'renders job log' do - expect(page).to have_selector('.js-build-output') + wait_for_all_requests + expect(page).to have_selector('.js-build-trace') end end @@ -658,7 +660,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do it 'renders empty state' do expect(page).to have_content(job.detailed_status(user).illustration[:title]) - expect(page).not_to have_selector('.js-build-output') + expect(page).not_to have_selector('.js-build-trace') expect(page).to have_content('This job has been canceled') end end @@ -673,7 +675,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do it 'renders empty state' do expect(page).to have_content(job.detailed_status(user).illustration[:title]) - expect(page).not_to have_selector('.js-build-output') + expect(page).not_to have_selector('.js-build-trace') expect(page).to have_content('This job has been skipped') end end @@ -722,8 +724,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do visit project_job_path(project, job) wait_for_requests - expect(page).to have_css('.js-build-sidebar.right-sidebar-collapsed', visible: false) - expect(page).not_to have_css('.js-build-sidebar.right-sidebar-expanded', visible: false) + expect(page).to have_css('.js-job-sidebar.right-sidebar-collapsed', visible: false) + expect(page).not_to have_css('.js-job-sidebar.right-sidebar-expanded', visible: false) end end @@ -734,8 +736,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do visit project_job_path(project, job) wait_for_requests - expect(page).to have_css('.js-build-sidebar.right-sidebar-expanded') - expect(page).not_to have_css('.js-build-sidebar.right-sidebar-collpased') + expect(page).to have_css('.js-job-sidebar.right-sidebar-expanded') + expect(page).not_to have_css('.js-job-sidebar.right-sidebar-collpased') end end end |