Merge branch 'next-minor' into develop

features/step_definitions/comment_steps.rb

@@ -31,5 +31,4 @@ Given /^"([^"]*)" has commented a lot on "([^"]*)"$/ do |email, post_text|
       user.comment!(post, "Comment #{n}")
     end
   end
-  Timecop.return
 end

spec/lib/evil_query_spec.rb

@@ -72,8 +72,6 @@ describe EvilQuery::Participation do
 
         alice.comment!(@status_messageE, "party")
       end
-
-      Timecop.return
     end
 
     let(:posts) {EvilQuery::Participation.new(alice).posts}

spec/models/comment_spec.rb

@@ -68,13 +68,13 @@ describe Comment, type: :model do
 
   describe "interacted_at" do
     it "sets the interacted at of the parent to the created at of the comment" do
-      Timecop.travel(Time.zone.now + 1.minute)
+      Timecop.freeze(Time.zone.now + 1.minute) do
-
         comment = Comment::Generator.new(alice, status_bob, "why so formal?").build
         comment.save
         expect(status_bob.reload.interacted_at.to_i).to eq(comment.created_at.to_i)
       end
     end
+  end
 
   it_behaves_like "it is relayable" do
     let(:remote_parent) { FactoryGirl.create(:status_message, author: remote_raphael) }

spec/models/like_spec.rb

@@ -47,11 +47,12 @@ describe Like, type: :model do
     it "doesn't change the interacted at timestamp of the parent" do
       interacted_at = status.reload.interacted_at.to_i
 
-      Timecop.travel(Time.zone.now + 1.minute)
+      Timecop.travel(Time.zone.now + 1.minute) do
         Like::Generator.new(alice, status).build.save
         expect(status.reload.interacted_at.to_i).to eq(interacted_at)
       end
     end
+  end
 
   it_behaves_like "it is relayable" do
     let(:remote_parent) { FactoryGirl.create(:status_message, author: remote_raphael) }