Refs: #3595@3h; fixing tests, evaluating timeliness gem :(

1 files changed, 10 insertions, 8 deletions

diff --git a/spec/models/calendar_spec.rb b/spec/models/calendar_spec.rb
index 33d9676cd..6a2b24011 100644
--- a/spec/models/calendar_spec.rb
+++ b/spec/models/calendar_spec.rb
@@ -42,10 +42,10 @@ RSpec.describe Calendar, :type => :model do
     subject { period }
 
     def period(attributes = {})
-      return @period if attributes.empty? and @period
-      Calendar::Period.new(attributes).tap do |period|
-        @period = period if attributes.empty?
-      end
+      @__period__ ||= {}
+      @__period__.fetch(attributes){ 
+        @__period__[attributes] = Calendar::Period.new(attributes)
+      }
     end
 
     it 'should support mark_for_destruction (required by cocoon)' do
@@ -125,9 +125,9 @@ RSpec.describe Calendar, :type => :model do
     subject { date_value }
 
     def date_value(attributes = {})
-      return @date_value if attributes.empty? and @date_value
-      Calendar::DateValue.new(attributes).tap do |date_value|
-        @date_value = date_value if attributes.empty?
+      @__date_values__ ||= Hash.new
+      @__date_values__.fetch(attributes) do
+        @__date_values__[attributes] = Calendar::DateValue.new(attributes)
       end
     end
 
@@ -150,7 +150,9 @@ RSpec.describe Calendar, :type => :model do
       expect(date_value(value: '2017-01-03').value).to eq(Date.new(2017,01,03))
     end
 
-    it { is_expected.to validate_presence_of(:value) }
+    it 'validates presence' do
+      is_expected.to validate_presence_of(:value)
+    end
   end
 end