Dry up next_time_from. Move cron_parser_spec to appropriate location.

3 files changed, 105 insertions, 111 deletions

diff --git a/lib/gitlab/ci/cron_parser.rb b/lib/gitlab/ci/cron_parser.rb
index 01f37142510..2d9ea26faf0 100644
--- a/lib/gitlab/ci/cron_parser.rb
+++ b/lib/gitlab/ci/cron_parser.rb
@@ -11,11 +11,7 @@ module Gitlab
 
       def next_time_from(time)
         cron_line = try_parse_cron(@cron, @cron_time_zone)
-        if cron_line.present?
-          cron_line.next_time(time).in_time_zone(Time.zone)
-        else
-          nil
-        end
+        cron_line.next_time(time).in_time_zone(Time.zone) if cron_line.present?
       end
 
       def validation
diff --git a/spec/lib/ci/cron_parser_spec.rb b/spec/lib/ci/cron_parser_spec.rb
deleted file mode 100644
index fb4a5ec4d13..00000000000
--- a/spec/lib/ci/cron_parser_spec.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-require 'spec_helper'
-
-module Ci
-  describe CronParser, lib: true do
-    shared_examples_for "returns time in the future" do
-      it { is_expected.to be > Time.now }
-    end
-
-    describe '#next_time_from' do
-      subject { described_class.new(cron, cron_time_zone).next_time_from(Time.now) }
-
-      context 'when cron and cron_time_zone are valid' do
-        context 'when specific time' do
-          let(:cron) { '3 4 5 6 *' }
-          let(:cron_time_zone) { 'UTC' }
-
-          it_behaves_like "returns time in the future"
-
-          it 'returns exact time' do
-            expect(subject.min).to eq(3)
-            expect(subject.hour).to eq(4)
-            expect(subject.day).to eq(5)
-            expect(subject.month).to eq(6)
-          end
-        end
-
-        context 'when specific day of week' do
-          let(:cron) { '* * * * 0' }
-          let(:cron_time_zone) { 'UTC' }
-
-          it_behaves_like "returns time in the future"
-
-          it 'returns exact day of week' do
-            expect(subject.wday).to eq(0)
-          end
-        end
-
-        context 'when slash used' do
-          let(:cron) { '*/10 */6 */10 */10 *' }
-          let(:cron_time_zone) { 'UTC' }
-
-          it_behaves_like "returns time in the future"
-
-          it 'returns specific time' do
-            expect(subject.min).to be_in([0, 10, 20, 30, 40, 50])
-            expect(subject.hour).to be_in([0, 6, 12, 18])
-            expect(subject.day).to be_in([1, 11, 21, 31])
-            expect(subject.month).to be_in([1, 11])
-          end
-        end
-
-        context 'when range used' do
-          let(:cron) { '0,20,40 * 1-5 * *' }
-          let(:cron_time_zone) { 'UTC' }
-
-          it_behaves_like "returns time in the future"
-
-          it 'returns specific time' do
-            expect(subject.min).to be_in([0, 20, 40])
-            expect(subject.day).to be_in((1..5).to_a)
-          end
-        end
-
-        context 'when cron_time_zone is US/Pacific' do
-          let(:cron) { '0 0 * * *' }
-          let(:cron_time_zone) { 'US/Pacific' }
-
-          it_behaves_like "returns time in the future"
-
-          it 'converts time in server time zone' do
-            expect(subject.hour).to eq(7)
-          end
-        end
-      end
-
-      context 'when cron and cron_time_zone are invalid' do
-        let(:cron) { 'invalid_cron' }
-        let(:cron_time_zone) { 'invalid_cron_time_zone' }
-
-        it 'returns nil' do
-          is_expected.to be_nil
-        end 
-      end
-    end
-
-    describe '#validation' do
-      it 'returns results' do
-        is_valid_cron, is_valid_cron_time_zone = described_class.new('* * * * *', 'Europe/Istanbul').validation
-        expect(is_valid_cron).to eq(true)
-        expect(is_valid_cron_time_zone).to eq(true)
-      end
-
-      it 'returns results' do
-        is_valid_cron, is_valid_cron_time_zone = described_class.new('*********', 'Europe/Istanbul').validation
-        expect(is_valid_cron).to eq(false)
-        expect(is_valid_cron_time_zone).to eq(true)
-      end
-
-      it 'returns results' do
-        is_valid_cron, is_valid_cron_time_zone = described_class.new('* * * * *', 'Invalid-zone').validation
-        expect(is_valid_cron).to eq(true)
-        expect(is_valid_cron_time_zone).to eq(false)
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/ci/cron_parser_spec.rb b/spec/lib/gitlab/ci/cron_parser_spec.rb
new file mode 100644
index 00000000000..62d1ea3f087
--- /dev/null
+++ b/spec/lib/gitlab/ci/cron_parser_spec.rb
@@ -0,0 +1,104 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::CronParser do
+  shared_examples_for "returns time in the future" do
+    it { is_expected.to be > Time.now }
+  end
+
+  describe '#next_time_from' do
+    subject { described_class.new(cron, cron_time_zone).next_time_from(Time.now) }
+
+    context 'when cron and cron_time_zone are valid' do
+      context 'when specific time' do
+        let(:cron) { '3 4 5 6 *' }
+        let(:cron_time_zone) { 'UTC' }
+
+        it_behaves_like "returns time in the future"
+
+        it 'returns exact time' do
+          expect(subject.min).to eq(3)
+          expect(subject.hour).to eq(4)
+          expect(subject.day).to eq(5)
+          expect(subject.month).to eq(6)
+        end
+      end
+
+      context 'when specific day of week' do
+        let(:cron) { '* * * * 0' }
+        let(:cron_time_zone) { 'UTC' }
+
+        it_behaves_like "returns time in the future"
+
+        it 'returns exact day of week' do
+          expect(subject.wday).to eq(0)
+        end
+      end
+
+      context 'when slash used' do
+        let(:cron) { '*/10 */6 */10 */10 *' }
+        let(:cron_time_zone) { 'UTC' }
+
+        it_behaves_like "returns time in the future"
+
+        it 'returns specific time' do
+          expect(subject.min).to be_in([0, 10, 20, 30, 40, 50])
+          expect(subject.hour).to be_in([0, 6, 12, 18])
+          expect(subject.day).to be_in([1, 11, 21, 31])
+          expect(subject.month).to be_in([1, 11])
+        end
+      end
+
+      context 'when range used' do
+        let(:cron) { '0,20,40 * 1-5 * *' }
+        let(:cron_time_zone) { 'UTC' }
+
+        it_behaves_like "returns time in the future"
+
+        it 'returns specific time' do
+          expect(subject.min).to be_in([0, 20, 40])
+          expect(subject.day).to be_in((1..5).to_a)
+        end
+      end
+
+      context 'when cron_time_zone is US/Pacific' do
+        let(:cron) { '0 0 * * *' }
+        let(:cron_time_zone) { 'US/Pacific' }
+
+        it_behaves_like "returns time in the future"
+
+        it 'converts time in server time zone' do
+          expect(subject.hour).to eq(7)
+        end
+      end
+    end
+
+    context 'when cron and cron_time_zone are invalid' do
+      let(:cron) { 'invalid_cron' }
+      let(:cron_time_zone) { 'invalid_cron_time_zone' }
+
+      it 'returns nil' do
+        is_expected.to be_nil
+      end 
+    end
+  end
+
+  describe '#validation' do
+    it 'returns results' do
+      is_valid_cron, is_valid_cron_time_zone = described_class.new('* * * * *', 'Europe/Istanbul').validation
+      expect(is_valid_cron).to eq(true)
+      expect(is_valid_cron_time_zone).to eq(true)
+    end
+
+    it 'returns results' do
+      is_valid_cron, is_valid_cron_time_zone = described_class.new('*********', 'Europe/Istanbul').validation
+      expect(is_valid_cron).to eq(false)
+      expect(is_valid_cron_time_zone).to eq(true)
+    end
+
+    it 'returns results' do
+      is_valid_cron, is_valid_cron_time_zone = described_class.new('* * * * *', 'Invalid-zone').validation
+      expect(is_valid_cron).to eq(true)
+      expect(is_valid_cron_time_zone).to eq(false)
+    end
+  end
+end