diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-07-01 15:23:09 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-05 18:38:34 +0900 |
| commit | 5e7db4e36c46f5807d7b486baf90c18dd1a5805f (patch) | |
| tree | ef68cdf78814a844d87cc594b6f8f14614f265cd | |
| parent | 124170093a1496569848571c71eb2ca779ae676b (diff) | |
| download | gitlab-ce-5e7db4e36c46f5807d7b486baf90c18dd1a5805f.tar.gz | |
Fix spec
| -rw-r--r-- | app/models/ci/build.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/pipeline_schedules_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 093218a74d6..841ad90a9cc 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -193,7 +193,7 @@ module Ci variables += user_variables variables += project.secret_variables_for(ref).map(&:to_runner_variable) variables += trigger_request.user_variables if trigger_request - variables += pipeline.pipeline_schedule&.job_variables + variables += pipeline.pipeline_schedule.job_variables if pipeline.pipeline_schedule variables end diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb index f6ad4c26c00..fa7f8561f46 100644 --- a/spec/features/projects/pipeline_schedules_spec.rb +++ b/spec/features/projects/pipeline_schedules_spec.rb @@ -24,7 +24,7 @@ feature 'Pipeline Schedules', :feature, js: true do page.within('.pipeline-schedule-table-row') do expect(page).to have_content('pipeline schedule') expect(find(".next-run-cell time")['data-original-title']) - .to include(pipeline_schedule.real_next_run.strftime('%b %d, %Y')) + .to include(pipeline_schedule.real_next_run.strftime('%b %-d, %Y')) expect(page).to have_link('master') expect(page).to have_link("##{pipeline.id}") end |