kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix spec

This commit is contained in:
Shinya Maeda 2017-07-01 15:23:09 +09:00
parent 124170093a
commit 5e7db4e36c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/ci/build.rb
View File

@ -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

2
spec/features/projects/pipeline_schedules_spec.rb
View File

@ -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