diff options
author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-05-25 19:18:41 +0900 |
---|---|---|
committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-05-29 20:02:09 +0900 |
commit | ba86ad390cb8fc86ab9835b4165716b7746cd09d (patch) | |
tree | 86ae64458eff1e3d1452af611379304aa99f3c44 | |
parent | 6b75868c7694739bfe3a315c6d789223ee56940a (diff) | |
download | gitlab-ce-ba86ad390cb8fc86ab9835b4165716b7746cd09d.tar.gz |
Revert "Reproduced"
This reverts commit 3e0d8b4ca7d7bd0f1ce014b6caaff1b1e32b1f8f.
-rw-r--r-- | app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | 3 | ||||
-rw-r--r-- | spec/features/projects/pipeline_schedules_spec.rb | 24 |
2 files changed, 1 insertions, 26 deletions
diff --git a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml index 5a2b7f5d177..082a6bcbb2a 100644 --- a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml +++ b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml @@ -4,8 +4,7 @@ = pipeline_schedule.description %td.branch-name-cell = icon('code-fork') - - if pipeline_schedule.ref.present? - = link_to pipeline_schedule.ref, project_ref_path(@project, pipeline_schedule.ref), class: "ref-name" + = link_to pipeline_schedule.ref, project_ref_path(@project, pipeline_schedule.ref), class: "ref-name" %td - if pipeline_schedule.last_pipeline .status-icon-container{ class: "ci-status-icon-#{pipeline_schedule.last_pipeline.status}" } diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb index d7112bab017..f40e1bc4930 100644 --- a/spec/features/projects/pipeline_schedules_spec.rb +++ b/spec/features/projects/pipeline_schedules_spec.rb @@ -65,17 +65,6 @@ feature 'Pipeline Schedules', :feature do expect(page).not_to have_content('pipeline schedule') end end - - context 'when ref is NULL' do - before do - pipeline_schedule.update_attribute(:ref, nil) - visit_pipelines_schedules - end - - it 'shows a list of the pipeline schedules with empty ref column' do - expect(first('.branch-name-cell').text).to eq('') - end - end end describe 'POST /projects/pipeline_schedules/new', js: true do @@ -119,19 +108,6 @@ feature 'Pipeline Schedules', :feature do expect(page).to have_content('my brand new description') end - - context 'when ref is NULL' do - before do - pipeline_schedule.update_attribute(:ref, nil) - edit_pipeline_schedule - end - - it 'shows the pipeline schedule with default ref' do - page.within('.git-revision-dropdown-toggle') do - expect(first('.dropdown-toggle-text').text).to eq('master') - end - end - end end def visit_new_pipeline_schedule |