From 97857490576d55013c9ff47ef5641929e5caa4db Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Sat, 22 Aug 2015 19:46:28 +0200
Subject: [PATCH] Refactors organization factories & admin controller

---
 app/controllers/admin/organizations_controller.rb |  4 ++--
 spec/factories.rb                                 | 13 +++++++------
 spec/features/admin/organizations_spec.rb         | 11 ++++++-----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb
index 19003ad3a..de99bbc44 100644
--- a/app/controllers/admin/organizations_controller.rb
+++ b/app/controllers/admin/organizations_controller.rb
@@ -1,6 +1,6 @@
 class Admin::OrganizationsController < Admin::BaseController
-  before_filter :set_valid_filters
-  before_filter :parse_filter
+  before_filter :set_valid_filters, only: :index
+  before_filter :parse_filter, only: :index
 
   load_and_authorize_resource
 
diff --git a/spec/factories.rb b/spec/factories.rb
index a6090efbb..de12209e0 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -46,14 +46,14 @@ FactoryGirl.define do
   factory :organization do
     user
     sequence(:name) { |n| "org#{n}" }
-  end
 
-  factory :verified_organization, parent: :organization do
-    verified_at { Time.now}
-  end
+    trait :verified do
+      verified_at Time.now
+    end
 
-  factory :rejected_organization, parent: :organization do
-    rejected_at { Time.now}
+    trait :rejected do
+      rejected_at Time.now
+    end
   end
 
   factory :tag, class: 'ActsAsTaggableOn::Tag' do
@@ -83,4 +83,5 @@ FactoryGirl.define do
     id { SecureRandom.uuid }
     started_at DateTime.now
   end
+
 end
diff --git a/spec/features/admin/organizations_spec.rb b/spec/features/admin/organizations_spec.rb
index 954e2ee8f..d13758117 100644
--- a/spec/features/admin/organizations_spec.rb
+++ b/spec/features/admin/organizations_spec.rb
@@ -25,7 +25,7 @@ feature 'Admin::Organizations' do
   end
 
   scenario "verified organizations have link to reject" do
-    organization = create(:verified_organization)
+    organization = create(:organization, :verified)
 
     visit admin_organizations_path
     expect(page).to have_content ('Verified')
@@ -40,7 +40,7 @@ feature 'Admin::Organizations' do
   end
 
   scenario "rejected organizations have link to verify" do
-    organization = create(:rejected_organization)
+    organization = create(:organization, :rejected)
 
     visit admin_organizations_path
     expect(page).to have_link('Verify')
@@ -87,8 +87,8 @@ feature 'Admin::Organizations' do
 
   scenario "Filtering organizations" do
     create(:organization, name: "Pending Organization")
-    create(:rejected_organization, name: "Rejected Organization")
-    create(:verified_organization, name: "Verified Organization")
+    create(:organization, :rejected, name: "Rejected Organization")
+    create(:organization, :verified, name: "Verified Organization")
 
     visit admin_organizations_path(filter: 'all')
     expect(page).to have_content('Pending Organization')
@@ -112,7 +112,8 @@ feature 'Admin::Organizations' do
   end
 
   scenario "Verifying organization links remember the pagination setting and the filter" do
-    30.times { create(:organization) }
+    per_page = Kaminari.config.default_per_page
+    (per_page + 2).times { create(:organization) }
 
     visit admin_organizations_path(filter: 'pending', page: 2)