Merge pull request #362 from AyuntamientoMadrid/pending-filter

Changes default filter to 'pending' in /admin & /moderation

app/controllers/admin/organizations_controller.rb

@@ -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
 

app/controllers/moderation/comments_controller.rb

@@ -1,5 +1,5 @@
 class Moderation::CommentsController < Moderation::BaseController
-  has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
+  has_filters %w{pending_flag_review all with_ignored_flag}, only: :index
 
   before_action :load_comments, only: :index
 

app/controllers/moderation/debates_controller.rb

@@ -1,5 +1,5 @@
 class Moderation::DebatesController < Moderation::BaseController
-  has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
+  has_filters %w{pending_flag_review all with_ignored_flag}, only: :index
 
   before_action :load_debates, only: :index
 

spec/features/admin/organizations_spec.rb

@@ -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')
 

spec/features/moderation/comments_spec.rb

@@ -102,8 +102,8 @@ feature 'Moderate Comments' do
 
     scenario "Current filter is properly highlighted" do
       visit moderation_comments_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('Ignored')
 
       visit moderation_comments_path(filter: 'all')
@@ -191,6 +191,8 @@ feature 'Moderate Comments' do
 
         expect(current_path).to eq(moderation_comments_path)
 
+        click_link('Ignored')
+
         within("#comment_#{@comment.id}") do
           expect(page).to have_content('Ignored')
         end

spec/features/moderation/debates_spec.rb

@@ -45,8 +45,8 @@ feature 'Moderate debates' do
 
     scenario "Current filter is properly highlighted" do
       visit moderation_debates_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('Ignored')
 
       visit moderation_debates_path(filter: 'all')
@@ -133,6 +133,8 @@ feature 'Moderate debates' do
 
         expect(current_path).to eq(moderation_debates_path)
 
+        click_link('All')
+
         within("#debate_#{@debate.id}") do
           expect(page).to have_content('Ignored')
         end