rails_admin 0.6.0 → 0.6.1

data/spec/helpers/rails_admin/form_builder_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe "RailsAdmin::FormBuilder" do
-  describe "#generate" do
+describe 'RailsAdmin::FormBuilder' do
+  describe '#generate' do
     before do
       allow(helper).to receive(:authorized?).and_return(true)
       (@object = Player.new).save
       @builder = RailsAdmin::FormBuilder.new(:player, @object, helper, {}, nil)
-      allow(@builder).to receive(:field_for).and_return("field")
+      allow(@builder).to receive(:field_for).and_return('field')
     end
 
-    it "does not add additional error div from default ActionView::Base.field_error_proc" do
-      expect(@builder.generate({ :action => :create, :model_config => RailsAdmin.config(Player) })).not_to have_css(".field_with_errors")
-      expect(@builder.generate({ :action => :create, :model_config => RailsAdmin.config(Player) })).to have_css(".control-group.error")
+    it 'does not add additional error div from default ActionView::Base.field_error_proc' do
+      expect(@builder.generate(action: :create, model_config: RailsAdmin.config(Player))).not_to have_css('.field_with_errors')
+      expect(@builder.generate(action: :create, model_config: RailsAdmin.config(Player))).to have_css('.control-group.error')
     end
   end
 end

data/spec/integration/authorization/cancan_spec.rb

@@ -4,29 +4,28 @@ class Ability
   include CanCan::Ability
   def initialize(user)
     can :access, :rails_admin if user.roles.include? :admin
-    unless user.roles.include? :test_exception
-      can :dashboard
-      can :manage, Player if user.roles.include? :manage_player
-      can :read, Player, :retired => false if user.roles.include? :read_player
-      can :create, Player, :suspended => true if user.roles.include? :create_player
-      can :update, Player, :retired => false if user.roles.include? :update_player
-      can :destroy, Player, :retired => false if user.roles.include? :destroy_player
-      can :history, Player, :retired => false if user.roles.include? :history_player
-      can :show_in_app, Player, :retired => false if user.roles.include? :show_in_app_player
-    else
+    if user.roles.include? :test_exception
       can :dashboard
       can :access, :rails_admin
       can :manage, :all
       can :show_in_app, :all
 
-
       # fix for buggy and inconsistent behaviour in Cancan 1.6.8 => https://github.com/ryanb/cancan/issues/721
       if CI_ORM != :mongoid
         cannot [:update, :destroy], Player
-        can [:update, :destroy], Player, :retired => false
+        can [:update, :destroy], Player, retired: false
       else
-        cannot [:update, :destroy], Player, :retired => true
+        cannot [:update, :destroy], Player, retired: true
       end
+    else
+      can :dashboard
+      can :manage, Player if user.roles.include? :manage_player
+      can :read, Player, retired: false if user.roles.include? :read_player
+      can :create, Player, suspended: true if user.roles.include? :create_player
+      can :update, Player, retired: false if user.roles.include? :update_player
+      can :destroy, Player, retired: false if user.roles.include? :destroy_player
+      can :history, Player, retired: false if user.roles.include? :history_player
+      can :show_in_app, Player, retired: false if user.roles.include? :show_in_app_player
     end
   end
 end
@@ -40,46 +39,48 @@ class AdminAbility
   end
 end
 
-describe "RailsAdmin CanCan Authorization" do
+describe 'RailsAdmin CanCan Authorization' do
 
   subject { page }
 
-  before(:each) do
+  before do
     RailsAdmin.config do |c|
       c.authorize_with(:cancan)
+      c.authenticate_with { warden.authenticate! scope: :user }
+      c.current_user_method(&:current_user)
     end
     @player_model = RailsAdmin::AbstractModel.new(Player)
     @user = FactoryGirl.create :user
     login_as @user
   end
 
-  describe "with no roles" do
-    before(:each) do
-      @user.update_attributes(:roles => [])
+  describe 'with no roles' do
+    before do
+      @user.update_attributes(roles: [])
     end
 
-    it "GET /admin should raise CanCan::AccessDenied" do
-      expect{ visit dashboard_path }.to raise_error(CanCan::AccessDenied)
+    it 'GET /admin should raise CanCan::AccessDenied' do
+      expect { visit dashboard_path }.to raise_error(CanCan::AccessDenied)
     end
 
-    it "GET /admin/player should raise CanCan::AccessDenied" do
-      expect{ visit index_path(:model_name => "player") }.to raise_error(CanCan::AccessDenied)
+    it 'GET /admin/player should raise CanCan::AccessDenied' do
+      expect { visit index_path(model_name: 'player') }.to raise_error(CanCan::AccessDenied)
     end
   end
 
-  describe "with read player role" do
-    before(:each) do
-      @user.update_attributes(:roles => [:admin, :read_player])
+  describe 'with read player role' do
+    before do
+      @user.update_attributes(roles: [:admin, :read_player])
     end
 
-    it "GET /admin should show Player but not League" do
+    it 'GET /admin should show Player but not League' do
       visit dashboard_path
-      should have_content("Player")
-      should_not have_content("League")
-      should_not have_content("Add new")
+      should have_content('Player')
+      should_not have_content('League')
+      should_not have_content('Add new')
     end
 
-    it "GET /admin/player should render successfully but not list retired players and not show new, edit, or delete actions" do
+    it 'GET /admin/player should render successfully but not list retired players and not show new, edit, or delete actions' do
       # ensure :name column to be shown
       RailsAdmin.config Player do
         list do
@@ -87,15 +88,15 @@ describe "RailsAdmin CanCan Authorization" do
         end
       end
       @players = [
-        FactoryGirl.create(:player, :retired => false),
-        FactoryGirl.create(:player, :retired => true),
+        FactoryGirl.create(:player, retired: false),
+        FactoryGirl.create(:player, retired: true),
       ]
 
-      visit index_path(:model_name => "player")
+      visit index_path(model_name: 'player')
 
       should have_content(@players[0].name)
       should_not have_content(@players[1].name)
-      should_not have_content("Add new")
+      should_not have_content('Add new')
       should have_css('.show_member_link')
       should_not have_css('.edit_member_link')
       should_not have_css('.delete_member_link')
@@ -103,256 +104,250 @@ describe "RailsAdmin CanCan Authorization" do
       should_not have_css('.show_in_app_member_link')
     end
 
-    it "GET /admin/team should raise CanCan::AccessDenied" do
-      expect{ visit index_path(:model_name => "team") }.to raise_error(CanCan::AccessDenied)
+    it 'GET /admin/team should raise CanCan::AccessDenied' do
+      expect { visit index_path(model_name: 'team') }.to raise_error(CanCan::AccessDenied)
     end
 
-    it "GET /admin/player/new should raise CanCan::AccessDenied" do
-      expect{ visit new_path(:model_name => "player") }.to raise_error(CanCan::AccessDenied)
+    it 'GET /admin/player/new should raise CanCan::AccessDenied' do
+      expect { visit new_path(model_name: 'player') }.to raise_error(CanCan::AccessDenied)
     end
 
   end
 
-  describe "with create and read player role" do
-    before(:each) do
-      @user.update_attributes(:roles => [:admin, :read_player, :create_player])
+  describe 'with create and read player role' do
+    before do
+      @user.update_attributes(roles: [:admin, :read_player, :create_player])
     end
 
-    it "GET /admin/player/new should render and create record upon submission" do
-      visit new_path(:model_name => "player")
+    it 'GET /admin/player/new should render and create record upon submission' do
+      visit new_path(model_name: 'player')
 
-      should_not have_content("Save and edit")
-      should_not have_content("Delete")
+      should_not have_content('Save and edit')
+      should_not have_content('Delete')
 
-      should have_content("Save and add another")
-      fill_in "player[name]", :with   => "Jackie Robinson"
-      fill_in "player[number]", :with => "42"
-      fill_in "player[position]", :with => "Second baseman"
-      click_button "Save" # first(:button, "Save").click
-      should_not have_content("Edit")
+      should have_content('Save and add another')
+      fill_in 'player[name]', with: 'Jackie Robinson'
+      fill_in 'player[number]', with: '42'
+      fill_in 'player[position]', with: 'Second baseman'
+      click_button 'Save' # first(:button, "Save").click
+      should_not have_content('Edit')
 
-      @player = RailsAdmin::AbstractModel.new("Player").first
-      expect(@player.name).to eq("Jackie Robinson")
+      @player = RailsAdmin::AbstractModel.new('Player').first
+      expect(@player.name).to eq('Jackie Robinson')
       expect(@player.number).to eq(42)
-      expect(@player.position).to eq("Second baseman")
+      expect(@player.position).to eq('Second baseman')
       expect(@player).to be_suspended # suspended is inherited behavior based on permission
     end
 
-    it "GET /admin/player/1/edit should raise access denied" do
+    it 'GET /admin/player/1/edit should raise access denied' do
       @player = FactoryGirl.create :player
-      expect{ visit edit_path(:model_name => "player", :id => @player.id) }.to raise_error(CanCan::AccessDenied)
+      expect { visit edit_path(model_name: 'player', id: @player.id) }.to raise_error(CanCan::AccessDenied)
     end
 
   end
 
-  describe "with update and read player role" do
-    before(:each) do
-      @user.update_attributes(:roles => [:admin, :read_player, :update_player])
+  describe 'with update and read player role' do
+    before do
+      @user.update_attributes(roles: [:admin, :read_player, :update_player])
     end
 
-    it "GET /admin/player/1/edit should render and update record upon submission" do
+    it 'GET /admin/player/1/edit should render and update record upon submission' do
       @player = FactoryGirl.create :player
-      visit edit_path(:model_name => "player", :id => @player.id)
-      should have_content("Save and edit")
-      should_not have_content("Save and add another")
-      should_not have_content("Add new")
-      should_not have_content("Delete")
-      should_not have_content("History")
-      should_not have_content("Show in app")
-      fill_in "player[name]", :with => "Jackie Robinson"
-      click_button "Save" # click_button "Save" # first(:button, "Save").click
+      visit edit_path(model_name: 'player', id: @player.id)
+      should have_content('Save and edit')
+      should_not have_content('Save and add another')
+      should_not have_content('Add new')
+      should_not have_content('Delete')
+      should_not have_content('History')
+      should_not have_content('Show in app')
+      fill_in 'player[name]', with: 'Jackie Robinson'
+      click_button 'Save' # click_button "Save" # first(:button, "Save").click
       @player.reload
-      expect(@player.name).to eq("Jackie Robinson")
+      expect(@player.name).to eq('Jackie Robinson')
     end
 
-    it "GET /admin/player/1/edit with retired player should raise access denied" do
-      @player = FactoryGirl.create :player, :retired => true
-      expect{ visit edit_path(:model_name => "player", :id => @player.id) }.to raise_error(CanCan::AccessDenied)
+    it 'GET /admin/player/1/edit with retired player should raise access denied' do
+      @player = FactoryGirl.create :player, retired: true
+      expect { visit edit_path(model_name: 'player', id: @player.id) }.to raise_error(CanCan::AccessDenied)
     end
 
-    it "GET /admin/player/1/delete should raise access denied" do
+    it 'GET /admin/player/1/delete should raise access denied' do
       @player = FactoryGirl.create :player
-      expect{ visit delete_path(:model_name => "player", :id => @player.id) }.to raise_error(CanCan::AccessDenied)
+      expect { visit delete_path(model_name: 'player', id: @player.id) }.to raise_error(CanCan::AccessDenied)
     end
 
   end
 
-  describe "with history role" do
-    it "shows links to history action" do
+  describe 'with history role' do
+    it 'shows links to history action' do
 
-      @user.update_attributes(:roles => [:admin, :read_player, :history_player])
+      @user.update_attributes(roles: [:admin, :read_player, :history_player])
       @player = FactoryGirl.create :player
 
-      visit index_path(:model_name => "player")
-        should have_css('.show_member_link')
-        should_not have_css('.edit_member_link')
-        should_not have_css('.delete_member_link')
-        should have_css('.history_show_member_link')
-
-      visit show_path(:model_name => 'player', :id => @player.id)
-        should have_content("Show")
-        should_not have_content("Edit")
-        should_not have_content("Delete")
-        should have_content("History")
+      visit index_path(model_name: 'player')
+      should have_css('.show_member_link')
+      should_not have_css('.edit_member_link')
+      should_not have_css('.delete_member_link')
+      should have_css('.history_show_member_link')
 
+      visit show_path(model_name: 'player', id: @player.id)
+      should have_content('Show')
+      should_not have_content('Edit')
+      should_not have_content('Delete')
+      should have_content('History')
     end
   end
 
-  describe "with show in app role" do
-    it "shows links to show in app action" do
-
-      @user.update_attributes(:roles => [:admin, :read_player, :show_in_app_player])
+  describe 'with show in app role' do
+    it 'shows links to show in app action' do
+      @user.update_attributes(roles: [:admin, :read_player, :show_in_app_player])
       @player = FactoryGirl.create :player
 
-      visit index_path(:model_name => "player")
-        should have_css('.show_member_link')
-        should_not have_css('.edit_member_link')
-        should_not have_css('.delete_member_link')
-        should_not have_css('.history_show_member_link')
-        should have_css('.show_in_app_member_link')
-
-      visit show_path(:model_name => 'player', :id => @player.id)
-        should have_content("Show")
-        should_not have_content("Edit")
-        should_not have_content("Delete")
-        should_not have_content("History")
-        should have_content("Show in app")
-
+      visit index_path(model_name: 'player')
+      should have_css('.show_member_link')
+      should_not have_css('.edit_member_link')
+      should_not have_css('.delete_member_link')
+      should_not have_css('.history_show_member_link')
+      should have_css('.show_in_app_member_link')
+
+      visit show_path(model_name: 'player', id: @player.id)
+      should have_content('Show')
+      should_not have_content('Edit')
+      should_not have_content('Delete')
+      should_not have_content('History')
+      should have_content('Show in app')
     end
   end
 
-  describe "with all roles" do
-    it "shows links to all actions" do
-
-      @user.update_attributes(:roles => [:admin, :manage_player])
+  describe 'with all roles' do
+    it 'shows links to all actions' do
+      @user.update_attributes(roles: [:admin, :manage_player])
       @player = FactoryGirl.create :player
 
-      visit index_path(:model_name => "player")
-        should have_css('.show_member_link')
-        should have_css('.edit_member_link')
-        should have_css('.delete_member_link')
-        should have_css('.history_show_member_link')
-        should have_css('.show_in_app_member_link')
-
-      visit show_path(:model_name => 'player', :id => @player.id)
-        should have_content("Show")
-        should have_content("Edit")
-        should have_content("Delete")
-        should have_content("History")
-        should have_content("Show in app")
-
+      visit index_path(model_name: 'player')
+      should have_css('.show_member_link')
+      should have_css('.edit_member_link')
+      should have_css('.delete_member_link')
+      should have_css('.history_show_member_link')
+      should have_css('.show_in_app_member_link')
+
+      visit show_path(model_name: 'player', id: @player.id)
+      should have_content('Show')
+      should have_content('Edit')
+      should have_content('Delete')
+      should have_content('History')
+      should have_content('Show in app')
     end
   end
 
-  describe "with destroy and read player role" do
-    before(:each) do
-      @user.update_attributes(:roles => [:admin, :read_player, :destroy_player])
+  describe 'with destroy and read player role' do
+    before do
+      @user.update_attributes(roles: [:admin, :read_player, :destroy_player])
     end
 
-    it "GET /admin/player/1/delete should render and destroy record upon submission" do
+    it 'GET /admin/player/1/delete should render and destroy record upon submission' do
       @player = FactoryGirl.create :player
       player_id = @player.id
-      visit delete_path(:model_name => "player", :id => player_id)
+      visit delete_path(model_name: 'player', id: player_id)
 
       click_button "Yes, I'm sure"
 
       expect(@player_model.get(player_id)).to be_nil
     end
 
-    it "GET /admin/player/1/delete with retired player should raise access denied" do
-      @player = FactoryGirl.create :player, :retired => true
-      expect{ visit delete_path(:model_name => "player", :id => @player.id) }.to raise_error(CanCan::AccessDenied)
+    it 'GET /admin/player/1/delete with retired player should raise access denied' do
+      @player = FactoryGirl.create :player, retired: true
+      expect { visit delete_path(model_name: 'player', id: @player.id) }.to raise_error(CanCan::AccessDenied)
     end
 
-    it "GET /admin/player/bulk_delete should render records which are authorized to" do
-      active_player = FactoryGirl.create :player, :retired => false
-      retired_player = FactoryGirl.create :player, :retired => true
+    it 'GET /admin/player/bulk_delete should render records which are authorized to' do
+      active_player = FactoryGirl.create :player, retired: false
+      retired_player = FactoryGirl.create :player, retired: true
 
-      post bulk_action_path(:bulk_action => 'bulk_delete', :model_name => "player", :bulk_ids => [active_player, retired_player].map(&:id))
+      post bulk_action_path(bulk_action: 'bulk_delete', model_name: 'player', bulk_ids: [active_player, retired_player].collect(&:id))
 
       expect(response.body).to include(active_player.name)
       expect(response.body).not_to include(retired_player.name)
     end
 
-    it "POST /admin/player/bulk_destroy should destroy records which are authorized to" do
-      active_player = FactoryGirl.create :player, :retired => false
-      retired_player = FactoryGirl.create :player, :retired => true
+    it 'POST /admin/player/bulk_destroy should destroy records which are authorized to' do
+      active_player = FactoryGirl.create :player, retired: false
+      retired_player = FactoryGirl.create :player, retired: true
 
-      delete bulk_delete_path(:model_name => "player", :bulk_ids => [active_player, retired_player].map(&:id))
+      delete bulk_delete_path(model_name: 'player', bulk_ids: [active_player, retired_player].collect(&:id))
       expect(@player_model.get(active_player.id)).to be_nil
       expect(@player_model.get(retired_player.id)).not_to be_nil
     end
   end
 
-  describe "with exception role" do
-    it "GET /admin/player/bulk_delete should render records which are authorized to" do
-      @user.update_attributes(:roles => [:admin, :test_exception])
-      active_player = FactoryGirl.create :player, :retired => false
-      retired_player = FactoryGirl.create :player, :retired => true
+  describe 'with exception role' do
+    it 'GET /admin/player/bulk_delete should render records which are authorized to' do
+      @user.update_attributes(roles: [:admin, :test_exception])
+      active_player = FactoryGirl.create :player, retired: false
+      retired_player = FactoryGirl.create :player, retired: true
 
-      post bulk_action_path(:bulk_action => 'bulk_delete', :model_name => "player", :bulk_ids => [active_player, retired_player].map(&:id))
+      post bulk_action_path(bulk_action: 'bulk_delete', model_name: 'player', bulk_ids: [active_player, retired_player].collect(&:id))
 
       expect(response.body).to include(active_player.name)
       expect(response.body).not_to include(retired_player.name)
     end
 
-    it "POST /admin/player/bulk_destroy should destroy records which are authorized to" do
-      @user.update_attributes(:roles => [:admin, :test_exception])
-      active_player = FactoryGirl.create :player, :retired => false
-      retired_player = FactoryGirl.create :player, :retired => true
+    it 'POST /admin/player/bulk_destroy should destroy records which are authorized to' do
+      @user.update_attributes(roles: [:admin, :test_exception])
+      active_player = FactoryGirl.create :player, retired: false
+      retired_player = FactoryGirl.create :player, retired: true
 
-      delete bulk_delete_path(:model_name => "player", :bulk_ids => [active_player, retired_player].map(&:id))
+      delete bulk_delete_path(model_name: 'player', bulk_ids: [active_player, retired_player].collect(&:id))
       expect(@player_model.get(active_player.id)).to be_nil
       expect(@player_model.get(retired_player.id)).not_to be_nil
     end
   end
 
-  describe "with a custom admin ability" do
-    before(:each) do
-      RailsAdmin.config{|c| c.authorize_with :cancan, AdminAbility }
+  describe 'with a custom admin ability' do
+    before do
+      RailsAdmin.config { |c| c.authorize_with :cancan, AdminAbility }
       @user = FactoryGirl.create :user
       login_as @user
     end
 
-    describe "with admin role only" do
-      before(:each) do
-        @user.update_attributes(:roles => [:admin])
+    describe 'with admin role only' do
+      before do
+        @user.update_attributes(roles: [:admin])
       end
 
-      it "GET /admin/team should render successfully" do
-        visit index_path(:model_name => "team")
+      it 'GET /admin/team should render successfully' do
+        visit index_path(model_name: 'team')
         expect(page.status_code).to eq(200)
       end
 
-      it "GET /admin/player/new should render successfully" do
-        visit new_path(:model_name => "player")
+      it 'GET /admin/player/new should render successfully' do
+        visit new_path(model_name: 'player')
         expect(page.status_code).to eq(200)
       end
 
-      it "GET /admin/player/1/edit should render successfully" do
+      it 'GET /admin/player/1/edit should render successfully' do
         @player = FactoryGirl.create :player
-        visit edit_path(:model_name => "player", :id => @player.id)
+        visit edit_path(model_name: 'player', id: @player.id)
         expect(page.status_code).to eq(200)
       end
 
-      it "GET /admin/player/1/edit with retired player should render successfully" do
-        @player = FactoryGirl.create :player, :retired => true
-        visit edit_path(:model_name => "player", :id => @player.id)
+      it 'GET /admin/player/1/edit with retired player should render successfully' do
+        @player = FactoryGirl.create :player, retired: true
+        visit edit_path(model_name: 'player', id: @player.id)
         expect(page.status_code).to eq(200)
       end
 
-      it "GET /admin/player/1/delete should render successfully" do
+      it 'GET /admin/player/1/delete should render successfully' do
         @player = FactoryGirl.create :player
-        visit delete_path(:model_name => "player", :id => @player.id)
+        visit delete_path(model_name: 'player', id: @player.id)
         expect(page.status_code).to eq(200)
       end
 
-      it "GET /admin/player/1/delete with retired player should render successfully" do
-        @player = FactoryGirl.create :player, :retired => true
-        visit delete_path(:model_name => "player", :id => @player.id)
+      it 'GET /admin/player/1/delete with retired player should render successfully' do
+        @player = FactoryGirl.create :player, retired: true
+        visit delete_path(model_name: 'player', id: @player.id)
         expect(page.status_code).to eq(200)
       end
     end
   end
-
 end