Commit 5e7db4e3 authored by Shinya Maeda's avatar Shinya Maeda

Fix spec

parent 12417009
...@@ -193,7 +193,7 @@ module Ci ...@@ -193,7 +193,7 @@ module Ci
variables += user_variables variables += user_variables
variables += project.secret_variables_for(ref).map(&:to_runner_variable) variables += project.secret_variables_for(ref).map(&:to_runner_variable)
variables += trigger_request.user_variables if trigger_request 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 variables
end end
......
...@@ -24,7 +24,7 @@ feature 'Pipeline Schedules', :feature, js: true do ...@@ -24,7 +24,7 @@ feature 'Pipeline Schedules', :feature, js: true do
page.within('.pipeline-schedule-table-row') do page.within('.pipeline-schedule-table-row') do
expect(page).to have_content('pipeline schedule') expect(page).to have_content('pipeline schedule')
expect(find(".next-run-cell time")['data-original-title']) 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('master')
expect(page).to have_link("##{pipeline.id}") expect(page).to have_link("##{pipeline.id}")
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment