diff --git a/lib/travis/api/v3/models/cron.rb b/lib/travis/api/v3/models/cron.rb index 90f208c4..e0a75cd9 100644 --- a/lib/travis/api/v3/models/cron.rb +++ b/lib/travis/api/v3/models/cron.rb @@ -16,7 +16,7 @@ module Travis::API::V3 payload end - def next_build_time + def next_enqueuing if (disable_by_build) && (last_non_cron_build_date > last_planned_time) return after_next_planned_time diff --git a/lib/travis/api/v3/renderer/cron.rb b/lib/travis/api/v3/renderer/cron.rb index 225033ec..fdad9263 100644 --- a/lib/travis/api/v3/renderer/cron.rb +++ b/lib/travis/api/v3/renderer/cron.rb @@ -3,7 +3,7 @@ require 'travis/api/v3/renderer/model_renderer' module Travis::API::V3 class Renderer::Cron < Renderer::ModelRenderer representation(:minimal, :id) - representation(:standard, :id, :repository, :branch, :interval, :disable_by_build, :next_build_time) + representation(:standard, :id, :repository, :branch, :interval, :disable_by_build, :next_enqueuing) def repository model.branch.repository diff --git a/lib/travis/api/v3/services/crons/start.rb b/lib/travis/api/v3/services/crons/start.rb index 2ee13131..729d6a44 100644 --- a/lib/travis/api/v3/services/crons/start.rb +++ b/lib/travis/api/v3/services/crons/start.rb @@ -5,7 +5,7 @@ module Travis::API::V3 started = [] Models::Cron.all.each do |cron| - if cron.next_build_time <= Time.now + if cron.next_enqueuing <= Time.now cron.start started.push cron end diff --git a/spec/v3/models/cron_spec.rb b/spec/v3/models/cron_spec.rb index a991301c..0ce18c94 100644 --- a/spec/v3/models/cron_spec.rb +++ b/spec/v3/models/cron_spec.rb @@ -18,7 +18,7 @@ describe Travis::API::V3::Models::Cron do it "for daily builds" do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'daily', disable_by_build: false) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 1, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 1, 16) build.destroy cron.destroy end @@ -26,7 +26,7 @@ describe Travis::API::V3::Models::Cron do it "for weekly builds" do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'weekly', disable_by_build: false) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 7, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 7, 16) build.destroy cron.destroy end @@ -34,7 +34,7 @@ describe Travis::API::V3::Models::Cron do it "for monthly builds" do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'monthly', disable_by_build: false) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 31, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 31, 16) build.destroy cron.destroy end @@ -55,7 +55,7 @@ describe Travis::API::V3::Models::Cron do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'daily', disable_by_build: false) cron_build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') push_build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'push') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 1, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 1, 16) cron_build.destroy push_build.destroy cron.destroy @@ -65,7 +65,7 @@ describe Travis::API::V3::Models::Cron do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'weekly', disable_by_build: false) cron_build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') push_build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'push') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 7, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 7, 16) cron_build.destroy push_build.destroy cron.destroy @@ -75,7 +75,7 @@ describe Travis::API::V3::Models::Cron do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'monthly', disable_by_build: false) cron_build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') push_build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'push') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 31, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 31, 16) cron_build.destroy push_build.destroy cron.destroy @@ -96,7 +96,7 @@ describe Travis::API::V3::Models::Cron do it "for daily builds" do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'daily', disable_by_build: true) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'push') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 2, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 2, 16) build.destroy cron.destroy end @@ -104,7 +104,7 @@ describe Travis::API::V3::Models::Cron do it "for weekly builds" do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'weekly', disable_by_build: true) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'push') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 14, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 14, 16) build.destroy cron.destroy end @@ -112,7 +112,7 @@ describe Travis::API::V3::Models::Cron do it "for monthly builds" do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'monthly', disable_by_build: true) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'push') - expect(cron.next_build_time).to be == DateTime.new(2016, 2, 29, 16) # it's a leap year :-D + expect(cron.next_enqueuing).to be == DateTime.new(2016, 2, 29, 16) # it's a leap year :-D build.destroy cron.destroy end @@ -132,7 +132,7 @@ describe Travis::API::V3::Models::Cron do it "for daily builds" do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'daily', disable_by_build: true) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 1, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 1, 16) build.destroy cron.destroy end @@ -140,7 +140,7 @@ describe Travis::API::V3::Models::Cron do it "for weekly builds" do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'weekly', disable_by_build: true) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 7, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 7, 16) build.destroy cron.destroy end @@ -148,7 +148,7 @@ describe Travis::API::V3::Models::Cron do it "for monthly builds" do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'monthly', disable_by_build: true) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') - expect(cron.next_build_time).to be == DateTime.new(2016, 1, 31, 16) + expect(cron.next_enqueuing).to be == DateTime.new(2016, 1, 31, 16) build.destroy cron.destroy end @@ -171,7 +171,7 @@ describe Travis::API::V3::Models::Cron do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'daily', disable_by_build: true) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') Timecop.freeze(DateTime.new(2016, 1, 1, 19)) - expect(cron.next_build_time).to be == DateTime.now + expect(cron.next_enqueuing).to be == DateTime.now build.destroy cron.destroy end @@ -181,7 +181,7 @@ describe Travis::API::V3::Models::Cron do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'daily', disable_by_build: false) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') Timecop.freeze(DateTime.new(2016, 1, 1, 19)) - expect(cron.next_build_time).to be == DateTime.now + expect(cron.next_enqueuing).to be == DateTime.now build.destroy cron.destroy end @@ -191,7 +191,7 @@ describe Travis::API::V3::Models::Cron do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'weekly', disable_by_build: true) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') Timecop.freeze(DateTime.new(2016, 1, 7, 19)) - expect(cron.next_build_time).to be == DateTime.now + expect(cron.next_enqueuing).to be == DateTime.now build.destroy cron.destroy end @@ -201,7 +201,7 @@ describe Travis::API::V3::Models::Cron do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'weekly', disable_by_build: false) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') Timecop.freeze(DateTime.new(2016, 1, 7, 19)) - expect(cron.next_build_time).to be == DateTime.now + expect(cron.next_enqueuing).to be == DateTime.now build.destroy cron.destroy end @@ -211,7 +211,7 @@ describe Travis::API::V3::Models::Cron do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'monthly', disable_by_build: true) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') Timecop.freeze(DateTime.new(2016, 1, 31, 19)) - expect(cron.next_build_time).to be == DateTime.now + expect(cron.next_enqueuing).to be == DateTime.now build.destroy cron.destroy end @@ -221,7 +221,7 @@ describe Travis::API::V3::Models::Cron do cron = Travis::API::V3::Models::Cron.create(branch_id: branch.id, interval: 'monthly', disable_by_build: false) build = Travis::API::V3::Models::Build.create(:repository_id => repo.id, :branch_name => branch.name, :event_type => 'cron') Timecop.freeze(DateTime.new(2016, 1, 31, 19)) - expect(cron.next_build_time).to be == DateTime.now + expect(cron.next_enqueuing).to be == DateTime.now build.destroy cron.destroy end diff --git a/spec/v3/services/cron/create_spec.rb b/spec/v3/services/cron/create_spec.rb index 84efefd3..8b3b7a0c 100644 --- a/spec/v3/services/cron/create_spec.rb +++ b/spec/v3/services/cron/create_spec.rb @@ -39,7 +39,7 @@ describe Travis::API::V3::Services::Cron::Create do "name" => "#{branch.name}" }, "interval" => "monthly", "disable_by_build" => false, - "next_build_time" => current_cron.next_build_time.strftime('%Y-%m-%dT%H:%M:%SZ') + "next_enqueuing" => current_cron.next_enqueuing.strftime('%Y-%m-%dT%H:%M:%SZ') }} end diff --git a/spec/v3/services/cron/delete_spec.rb b/spec/v3/services/cron/delete_spec.rb index cb09c415..cecf96d8 100644 --- a/spec/v3/services/cron/delete_spec.rb +++ b/spec/v3/services/cron/delete_spec.rb @@ -35,7 +35,7 @@ describe Travis::API::V3::Services::Cron::Delete do "name" => branch.name }, "interval" => "daily", "disable_by_build" => true, - "next_build_time" => cron.next_build_time.strftime('%Y-%m-%dT%H:%M:%SZ') + "next_enqueuing" => cron.next_enqueuing.strftime('%Y-%m-%dT%H:%M:%SZ') }} end diff --git a/spec/v3/services/cron/find_spec.rb b/spec/v3/services/cron/find_spec.rb index 876b4940..36e1deb4 100644 --- a/spec/v3/services/cron/find_spec.rb +++ b/spec/v3/services/cron/find_spec.rb @@ -31,7 +31,7 @@ describe Travis::API::V3::Services::Cron::Find do "name" => branch.name }, "interval" => "daily", "disable_by_build" => true, - "next_build_time" => cron.next_build_time.strftime('%Y-%m-%dT%H:%M:%SZ') + "next_enqueuing" => cron.next_enqueuing.strftime('%Y-%m-%dT%H:%M:%SZ') }} end @@ -89,7 +89,7 @@ describe Travis::API::V3::Services::Cron::Find do "name" => branch.name }, "interval" => "daily", "disable_by_build" => true, - "next_build_time" => cron.next_build_time.strftime('%Y-%m-%dT%H:%M:%SZ') + "next_enqueuing" => cron.next_enqueuing.strftime('%Y-%m-%dT%H:%M:%SZ') }} end diff --git a/spec/v3/services/cron/for_branch_spec.rb b/spec/v3/services/cron/for_branch_spec.rb index aa75537e..13ca127d 100644 --- a/spec/v3/services/cron/for_branch_spec.rb +++ b/spec/v3/services/cron/for_branch_spec.rb @@ -32,7 +32,7 @@ describe Travis::API::V3::Services::Cron::ForBranch do "name" => branch.name }, "interval" => "daily", "disable_by_build" => true, - "next_build_time" => cron.next_build_time.strftime('%Y-%m-%dT%H:%M:%SZ') + "next_enqueuing" => cron.next_enqueuing.strftime('%Y-%m-%dT%H:%M:%SZ') }} end diff --git a/spec/v3/services/crons/for_repository_spec.rb b/spec/v3/services/crons/for_repository_spec.rb index b1eab41c..ad6d2ba3 100644 --- a/spec/v3/services/crons/for_repository_spec.rb +++ b/spec/v3/services/crons/for_repository_spec.rb @@ -53,7 +53,7 @@ describe Travis::API::V3::Services::Crons::ForRepository do "name" => "#{branch.name}" }, "interval" => "daily", "disable_by_build" => true, - "next_build_time" => cron.next_build_time.strftime('%Y-%m-%dT%H:%M:%SZ') + "next_enqueuing" => cron.next_enqueuing.strftime('%Y-%m-%dT%H:%M:%SZ') } ] }}