consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactors organization factories & admin controller

Browse Source
This commit is contained in:
kikito
2015-08-22 19:46:28 +02:00
parent 4f0c49f921
commit 9785749057
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/organizations_controller.rb
View File

@@ -1,6 +1,6 @@
class Admin::OrganizationsController < Admin::BaseController class Admin::OrganizationsController < Admin::BaseController
before_filter :set_valid_filters before_filter :set_valid_filters, only: :index
before_filter :parse_filter before_filter :parse_filter, only: :index
load_and_authorize_resource load_and_authorize_resource

13
spec/factories.rb
View File

@@ -46,14 +46,14 @@ FactoryGirl.define do
factory :organization do factory :organization do
user user
sequence(:name) { |n| "org#{n}" } sequence(:name) { |n| "org#{n}" }
end
factory :verified_organization, parent: :organization do trait :verified do
verified_at { Time.now} verified_at Time.now
end end
factory :rejected_organization, parent: :organization do trait :rejected do
rejected_at { Time.now} rejected_at Time.now
end
end end
factory :tag, class: 'ActsAsTaggableOn::Tag' do factory :tag, class: 'ActsAsTaggableOn::Tag' do
@@ -83,4 +83,5 @@ FactoryGirl.define do
id { SecureRandom.uuid } id { SecureRandom.uuid }
started_at DateTime.now started_at DateTime.now
end end
end end

11
spec/features/admin/organizations_spec.rb
View File

@@ -25,7 +25,7 @@ feature 'Admin::Organizations' do
end end
scenario "verified organizations have link to reject" do scenario "verified organizations have link to reject" do
organization = create(:verified_organization) organization = create(:organization, :verified)
visit admin_organizations_path visit admin_organizations_path
expect(page).to have_content ('Verified') expect(page).to have_content ('Verified')
@@ -40,7 +40,7 @@ feature 'Admin::Organizations' do
end end
scenario "rejected organizations have link to verify" do scenario "rejected organizations have link to verify" do
organization = create(:rejected_organization) organization = create(:organization, :rejected)
visit admin_organizations_path visit admin_organizations_path
expect(page).to have_link('Verify') expect(page).to have_link('Verify')
@@ -87,8 +87,8 @@ feature 'Admin::Organizations' do
scenario "Filtering organizations" do scenario "Filtering organizations" do
create(:organization, name: "Pending Organization") create(:organization, name: "Pending Organization")
create(:rejected_organization, name: "Rejected Organization") create(:organization, :rejected, name: "Rejected Organization")
create(:verified_organization, name: "Verified Organization") create(:organization, :verified, name: "Verified Organization")
visit admin_organizations_path(filter: 'all') visit admin_organizations_path(filter: 'all')
expect(page).to have_content('Pending Organization') expect(page).to have_content('Pending Organization')
@@ -112,7 +112,8 @@ feature 'Admin::Organizations' do
end end
scenario "Verifying organization links remember the pagination setting and the filter" do 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) visit admin_organizations_path(filter: 'pending', page: 2)