rails_admin 0.4.9 → 0.5.0

data/spec/integration/authorization/cancan_spec.rb

@@ -59,13 +59,11 @@ describe "RailsAdmin CanCan Authorization" do
     end
 
     it "GET /admin should raise CanCan::AccessDenied" do
-      visit dashboard_path
-      should have_content('CanCan::AccessDenied')
+      expect{ visit dashboard_path }.to raise_error CanCan::AccessDenied
     end
 
     it "GET /admin/player should raise CanCan::AccessDenied" do
-      visit index_path(:model_name => "player")
-      should have_content('CanCan::AccessDenied')
+      expect{ visit index_path(:model_name => "player") }.to raise_error CanCan::AccessDenied
     end
   end
 
@@ -106,13 +104,11 @@ describe "RailsAdmin CanCan Authorization" do
     end
 
     it "GET /admin/team should raise CanCan::AccessDenied" do
-      visit index_path(:model_name => "team")
-      should have_content('CanCan::AccessDenied')
+      expect{ visit index_path(:model_name => "team") }.to raise_error CanCan::AccessDenied
     end
 
     it "GET /admin/player/new should raise CanCan::AccessDenied" do
-      visit new_path(:model_name => "player")
-      should have_content('CanCan::AccessDenied')
+      expect{ visit new_path(:model_name => "player") }.to raise_error CanCan::AccessDenied
     end
 
   end
@@ -144,8 +140,7 @@ describe "RailsAdmin CanCan Authorization" do
 
     it "GET /admin/player/1/edit should raise access denied" do
       @player = FactoryGirl.create :player
-      visit edit_path(:model_name => "player", :id => @player.id)
-      should have_content('CanCan::AccessDenied')
+      expect{ visit edit_path(:model_name => "player", :id => @player.id) }.to raise_error CanCan::AccessDenied
     end
 
   end
@@ -172,14 +167,12 @@ describe "RailsAdmin CanCan Authorization" do
 
     it "GET /admin/player/1/edit with retired player should raise access denied" do
       @player = FactoryGirl.create :player, :retired => true
-      visit edit_path(:model_name => "player", :id => @player.id)
-      should have_content('CanCan::AccessDenied')
+      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
       @player = FactoryGirl.create :player
-      visit delete_path(:model_name => "player", :id => @player.id)
-      should have_content('CanCan::AccessDenied')
+      expect{ visit delete_path(:model_name => "player", :id => @player.id) }.to raise_error CanCan::AccessDenied
     end
 
   end
@@ -268,8 +261,7 @@ describe "RailsAdmin CanCan Authorization" do
 
     it "GET /admin/player/1/delete with retired player should raise access denied" do
       @player = FactoryGirl.create :player, :retired => true
-      visit delete_path(:model_name => "player", :id => @player.id)
-      should have_content('CanCan::AccessDenied')
+      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