makes 'pending' filter the default in /admin/orgs

This commit is contained in:
Juanjo Bazán
2015-09-04 22:38:51 +02:00
parent 4ef2ed753d
commit 63378ba24c
2 changed files with 16 additions and 6 deletions

View File

@@ -1,5 +1,5 @@
class Admin::OrganizationsController < Admin::BaseController
has_filters %w{all pending verified rejected}, only: :index
has_filters %w{pending all verified rejected}, only: :index
load_and_authorize_resource except: :search

View File

@@ -87,7 +87,9 @@ feature 'Admin::Organizations' do
organization = create(:organization, :verified)
visit admin_organizations_path
expect(current_path).to eq(admin_organizations_path)
click_on "Verified"
within("#organization_#{organization.id}") do
expect(page).to have_content ('Verified')
expect(page).to_not have_link('Verify')
@@ -96,7 +98,11 @@ feature 'Admin::Organizations' do
click_on 'Reject'
end
expect(current_path).to eq(admin_organizations_path)
expect(page).to_not have_content (organization.name)
click_on 'Rejected'
expect(page).to have_content ('Rejected')
expect(page).to have_content (organization.name)
expect(organization.reload.rejected?).to eq(true)
end
@@ -105,7 +111,8 @@ feature 'Admin::Organizations' do
organization = create(:organization, :rejected)
visit admin_organizations_path
expect(current_path).to eq(admin_organizations_path)
click_on "Rejected"
within("#organization_#{organization.id}") do
expect(page).to have_link('Verify')
expect(page).to_not have_link('Reject', exact: true)
@@ -113,15 +120,18 @@ feature 'Admin::Organizations' do
click_on 'Verify'
end
expect(current_path).to eq(admin_organizations_path)
expect(page).to have_content ('Verified')
expect(page).to_not have_content (organization.name)
click_on('Verified')
expect(page).to have_content (organization.name)
expect(organization.reload.verified?).to eq(true)
end
scenario "Current filter is properly highlighted" do
visit admin_organizations_path
expect(page).to_not have_link('All')
expect(page).to have_link('Pending')
expect(page).to_not have_link('Pending')
expect(page).to have_link('All')
expect(page).to have_link('Verified')
expect(page).to have_link('Rejected')