Merges master branch

spec/models/debate_spec.rb

@@ -681,7 +681,18 @@ describe Debate do
       end
 
     end
+  end
 
+  describe "#last_week" do
+    it "should return debates created this week" do
+      debate = create(:debate)
+      expect(Debate.last_week.all).to include (debate)
+    end
+
+    it "should not show debates created more than a week ago" do
+      debate = create(:debate, created_at: 8.days.ago)
+      expect(Debate.last_week.all).to_not include (debate)
+    end
   end
 
 end