From 8d48eccfed53556d177e1b92b31e51c871d28dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Tue, 13 Sep 2016 12:10:31 +0200
Subject: [PATCH] adds not_archived scope to proposal

---
 app/models/proposal.rb       | 1 +
 spec/factories.rb            | 2 +-
 spec/models/proposal_spec.rb | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index 99a4eedee..91b01f785 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -46,6 +46,7 @@ class Proposal < ActiveRecord::Base
   scope :sort_by_flags,            -> { order(flags_count: :desc, updated_at: :desc) }
   scope :sort_by_archival_date,    -> { archived.order(created_at: :desc) }
   scope :archived,                 -> { where("proposals.created_at <= ?", Setting["months_to_archive_proposals"].to_i.months.ago)}
+  scope :not_archived,             -> { where("proposals.created_at > ?", Setting["months_to_archive_proposals"].to_i.months.ago)}
   scope :last_week,                -> { where("proposals.created_at >= ?", 7.days.ago)}
   scope :retired,                  -> { where.not(retired_at: nil) }
   scope :not_retired,              -> { where(retired_at: nil) }
diff --git a/spec/factories.rb b/spec/factories.rb
index b70effb97..13371a504 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -164,7 +164,7 @@ FactoryGirl.define do
     end
 
     trait :archived do
-      created_at (Setting["months_to_archive_proposals"].to_i + 1).months.ago
+      created_at 25.months.ago
     end
 
     trait :with_hot_score do
diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb
index 517511607..d98392eaa 100644
--- a/spec/models/proposal_spec.rb
+++ b/spec/models/proposal_spec.rb
@@ -819,7 +819,7 @@ describe Proposal do
   end
 
   describe "archived" do
-    before(:all) do
+    before(:each) do
       @new_proposal = create(:proposal)
       @archived_proposal = create(:proposal, :archived)
     end
@@ -835,6 +835,13 @@ describe Proposal do
       expect(archived.size).to eq(1)
       expect(archived.first).to eq(@archived_proposal)
     end
+
+    it "scope archived" do
+      not_archived = Proposal.not_archived
+
+      expect(not_archived.size).to eq(1)
+      expect(not_archived.first).to eq(@new_proposal)
+    end
   end
 
 end