11require "time"
2- require "./spec/spec_helper"
32require "cron_parser"
43require "date"
54
@@ -8,7 +7,7 @@ def parse_date(str)
87 Time . local ( dt . year , dt . month , dt . day , dt . hour , dt . min , 0 )
98end
109
11- describe "CronParser#parse_element" do
10+ RSpec . describe "CronParser#parse_element" do
1211 [
1312 [ "*" , 0 ..59 , ( 0 ..59 ) . to_a ] ,
1413 [ "*/10" , 0 ..59 , [ 0 , 10 , 20 , 30 , 40 , 50 ] ] ,
@@ -19,12 +18,12 @@ def parse_date(str)
1918 ] . each do |element , range , expected |
2019 it "should return #{ expected } for '#{ element } ' when range is #{ range } " do
2120 parser = CronParser . new ( '* * * * *' )
22- parser . parse_element ( element , range ) . first . to_a . sort . should == expected . sort
21+ expect ( parser . parse_element ( element , range ) . first ) . to match_array ( expected )
2322 end
2423 end
2524end
2625
27- describe "CronParser#next" do
26+ RSpec . describe "CronParser#next" do
2827 [
2928 [ "* * * * *" , "2011-08-15 12:00" , "2011-08-15 12:01" , 1 ] ,
3029 [ "* * * * *" , "2011-08-15 02:25" , "2011-08-15 02:26" , 1 ] ,
@@ -83,30 +82,30 @@ def parse_date(str)
8382 parsed_now = parse_date ( now )
8483 expected = parse_date ( expected_next )
8584 parser = CronParser . new ( line )
86- parser . next ( parsed_now ) . xmlschema . should == expected . xmlschema
85+ expect ( parser . next ( parsed_now ) . xmlschema ) . to eql ( expected . xmlschema )
8786 end
8887 it "returns the expected class" do
8988 parsed_now = parse_date ( now )
9089 expected = parse_date ( expected_next )
9190 parser = CronParser . new ( line )
9291 result = parser . next ( parsed_now , num )
93- result . class . to_s . should == ( num > 1 ? ' Array' : ' Time' )
92+ expect ( result ) . to be_a ( num > 1 ? Array : Time )
9493 end
9594 it "returns the expected count" do
9695 parsed_now = parse_date ( now )
9796 expected = parse_date ( expected_next )
9897 parser = CronParser . new ( line )
9998 result = parser . next ( parsed_now , num )
100- if result . class . to_s == ' Array'
101- result . size . should == num
99+ if result . is_a? ( Array )
100+ expect ( result . size ) . to eql ( num )
102101 else
103- result . class . to_s . should == ' Time'
102+ expect ( result ) . to be_a ( Time )
104103 end
105104 end
106105 end
107106end
108107
109- describe "CronParser#last" do
108+ RSpec . describe "CronParser#last" do
110109 [
111110 [ "* * * * *" , "2011-08-15 12:00" , "2011-08-15 11:59" ] ,
112111 [ "* * * * *" , "2011-08-15 02:25" , "2011-08-15 02:24" ] ,
@@ -164,12 +163,12 @@ def parse_date(str)
164163
165164 parser = CronParser . new ( line )
166165
167- parser . last ( now ) . should == expected_next
166+ expect ( parser . last ( now ) ) . to eql ( expected_next )
168167 end
169168 end
170169end
171170
172- describe "CronParser#new" do
171+ RSpec . describe "CronParser#new" do
173172 it 'should not raise error when given a valid cronline' do
174173 expect { CronParser . new ( '30 * * * *' ) } . not_to raise_error
175174 end
@@ -179,10 +178,10 @@ def parse_date(str)
179178 end
180179end
181180
182- describe "time source" do
181+ RSpec . describe "time source" do
183182 it "should use an alternate specified time source" do
184183 ExtendedTime = Class . new ( Time )
185- ExtendedTime . should_receive ( :local ) . once
184+ expect ( ExtendedTime ) . to receive ( :local ) . once
186185 CronParser . new ( "* * * * *" , ExtendedTime ) . next
187186 end
188187end
0 commit comments