Commit d5201119 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix test failures

parent 344001d7
...@@ -31,7 +31,8 @@ module Ci ...@@ -31,7 +31,8 @@ module Ci
update_attribute(:next_run_at, nil) # update without validation update_attribute(:next_run_at, nil) # update without validation
end end
def real_next_run(worker_cron: Settings.cron_jobs['trigger_schedule_worker']['cron'], def real_next_run(
worker_cron: Settings.cron_jobs['trigger_schedule_worker']['cron'],
worker_time_zone: Time.zone.name) worker_time_zone: Time.zone.name)
Gitlab::Ci::CronParser.new(worker_cron, worker_time_zone) Gitlab::Ci::CronParser.new(worker_cron, worker_time_zone)
.next_time_from(next_run_at) .next_time_from(next_run_at)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
= schedule_fields.check_box :active = schedule_fields.check_box :active
%strong Schedule trigger (experimental) %strong Schedule trigger (experimental)
.help-block .help-block
If checked, this trigger will be executed periodically according to `Cron` and `Timezone`. If checked, this trigger will be executed periodically according to cron and timezone.
= link_to icon('question-circle'), help_page_path('ci/triggers', anchor: 'schedule') = link_to icon('question-circle'), help_page_path('ci/triggers', anchor: 'schedule')
.form-group .form-group
= schedule_fields.label :cron, "Cron", class: "label-light" = schedule_fields.label :cron, "Cron", class: "label-light"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
- if trigger.trigger_schedule&.active? - if trigger.trigger_schedule&.active?
= trigger.trigger_schedule.real_next_run = trigger.trigger_schedule.real_next_run
- else - else
None Never
%td.text-right.trigger-actions %td.text-right.trigger-actions
- take_ownership_confirmation = "By taking ownership you will bind this trigger to your user account. With this the trigger will have access to all your projects as if it was you. Are you sure?" - take_ownership_confirmation = "By taking ownership you will bind this trigger to your user account. With this the trigger will have access to all your projects as if it was you. Are you sure?"
......
...@@ -120,6 +120,7 @@ feature 'Triggers', feature: true, js: true do ...@@ -120,6 +120,7 @@ feature 'Triggers', feature: true, js: true do
visit edit_namespace_project_trigger_path(@project.namespace, @project, trigger) visit edit_namespace_project_trigger_path(@project.namespace, @project, trigger)
checkbox = find_field('trigger_trigger_schedule_attributes_active') checkbox = find_field('trigger_trigger_schedule_attributes_active')
expect(checkbox).not_to be_checked expect(checkbox).not_to be_checked
end end
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