Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-04 15:22:12 +0300
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-06 17:46:59 +0300
commit4a5c6a8e2953baeceb33d281d23d2c305ff884fa (patch)
treee16e8cd0a6f2cb225574c5bd8a75be5f8825c95e
parent0c153af73df3d5b10915cf9d32af728f9b6e8e98 (diff)
Rename cron_nightly_build to nightly
-rw-r--r--spec/factories/ci/trigger_schedules.rb6
-rw-r--r--spec/models/ci/trigger_schedule_spec.rb2
-rw-r--r--spec/workers/trigger_schedule_worker_spec.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/factories/ci/trigger_schedules.rb b/spec/factories/ci/trigger_schedules.rb
index 8aafbc1f81b..9c16d45b49a 100644
--- a/spec/factories/ci/trigger_schedules.rb
+++ b/spec/factories/ci/trigger_schedules.rb
@@ -14,17 +14,17 @@ FactoryGirl.define do
end
end
- trait :cron_nightly_build do
+ trait :nightly do
cron '0 1 * * *'
cron_time_zone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE
end
- trait :cron_weekly_build do
+ trait :weekly do
cron '0 1 * * 6'
cron_time_zone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE
end
- trait :cron_monthly_build do
+ trait :monthly do
cron '0 1 22 * *'
cron_time_zone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE
end
diff --git a/spec/models/ci/trigger_schedule_spec.rb b/spec/models/ci/trigger_schedule_spec.rb
index 81104cb26b6..9a4bf122bf0 100644
--- a/spec/models/ci/trigger_schedule_spec.rb
+++ b/spec/models/ci/trigger_schedule_spec.rb
@@ -6,7 +6,7 @@ describe Ci::TriggerSchedule, models: true do
it { is_expected.to respond_to :ref }
describe '#schedule_next_run!' do
- let(:trigger_schedule) { create(:ci_trigger_schedule, :cron_nightly_build, next_run_at: nil) }
+ let(:trigger_schedule) { create(:ci_trigger_schedule, :nightly, next_run_at: nil) }
before do
trigger_schedule.schedule_next_run!
diff --git a/spec/workers/trigger_schedule_worker_spec.rb b/spec/workers/trigger_schedule_worker_spec.rb
index 4df5731709b..75a98e42ac5 100644
--- a/spec/workers/trigger_schedule_worker_spec.rb
+++ b/spec/workers/trigger_schedule_worker_spec.rb
@@ -8,7 +8,7 @@ describe TriggerScheduleWorker do
end
context 'when there is a scheduled trigger within next_run_at' do
- let!(:trigger_schedule) { create(:ci_trigger_schedule, :cron_nightly_build, :force_triggable) }
+ let!(:trigger_schedule) { create(:ci_trigger_schedule, :nightly, :force_triggable) }
before do
worker.perform
@@ -29,7 +29,7 @@ describe TriggerScheduleWorker do
end
context 'when there are no scheduled triggers within next_run_at' do
- let!(:trigger_schedule) { create(:ci_trigger_schedule, :cron_nightly_build) }
+ let!(:trigger_schedule) { create(:ci_trigger_schedule, :nightly) }
before do
worker.perform