@@ -226,19 +226,33 @@ module IceCube
226
226
time . usec . should == 0
227
227
end
228
228
229
- describe 'weekly schedule with interval ' do
229
+ describe 'weekly schedule using occurs_between ' do
230
230
let ( :schedule ) { Schedule . new ( '2014-01-08' . to_date ) }
231
231
let ( :expected_occurrence ) { '2014-07-24' . to_date . to_time }
232
232
before :each do
233
- schedule . add_recurrence_rule Rule . weekly ( 2 ) . day ( [ 4 , 5 , 6 ] )
233
+ schedule . add_recurrence_rule rule
234
234
end
235
- it "should include the expected date" do
236
- expect ( schedule . occurs_on? ( expected_occurrence ) ) . to be_true
237
- expect ( schedule . occurrences_between ( expected_occurrence - 7 . days , expected_occurrence + 7 . days ) ) . to include ( expected_occurrence )
238
- expect ( schedule . occurrences_between ( expected_occurrence - 1 . day , expected_occurrence + 1 . day ) ) . to include ( expected_occurrence )
239
- expect ( schedule . occurrences_between ( expected_occurrence - 6 . days , expected_occurrence + 6 . days ) ) . to include ( expected_occurrence )
240
- expect ( schedule . occurrences_between ( expected_occurrence - 5 . days , expected_occurrence + 5 . days ) ) . to include ( expected_occurrence )
235
+ context "with interval" do
236
+ let ( :rule ) { Rule . weekly ( 2 ) . day ( [ 4 , 5 , 6 ] ) }
237
+ it "should include the expected date [#241]" do
238
+ expect ( schedule . occurs_on? ( expected_occurrence ) ) . to be_true
239
+ expect ( schedule . occurrences_between ( expected_occurrence - 7 . days , expected_occurrence + 7 . days ) ) . to include ( expected_occurrence )
240
+ expect ( schedule . occurrences_between ( expected_occurrence - 1 . day , expected_occurrence + 1 . day ) ) . to include ( expected_occurrence )
241
+ expect ( schedule . occurrences_between ( expected_occurrence - 6 . days , expected_occurrence + 6 . days ) ) . to include ( expected_occurrence )
242
+ expect ( schedule . occurrences_between ( expected_occurrence - 5 . days , expected_occurrence + 5 . days ) ) . to include ( expected_occurrence )
243
+ end
241
244
end
245
+ context "without interval" do
246
+ let ( :rule ) { Rule . weekly ( 1 ) . day ( [ 4 , 5 , 6 ] ) }
247
+ it "should include the expected date" do
248
+ expect ( schedule . occurs_on? ( expected_occurrence ) ) . to be_true
249
+ expect ( schedule . occurrences_between ( expected_occurrence - 7 . days , expected_occurrence + 7 . days ) ) . to include ( expected_occurrence )
250
+ expect ( schedule . occurrences_between ( expected_occurrence - 1 . day , expected_occurrence + 1 . day ) ) . to include ( expected_occurrence )
251
+ expect ( schedule . occurrences_between ( expected_occurrence - 6 . days , expected_occurrence + 6 . days ) ) . to include ( expected_occurrence )
252
+ expect ( schedule . occurrences_between ( expected_occurrence - 5 . days , expected_occurrence + 5 . days ) ) . to include ( expected_occurrence )
253
+ end
254
+ end
255
+
242
256
end
243
257
244
258
end
0 commit comments