rails_admin 0.6.2 → 0.6.3

data/spec/factories.rb

@@ -42,14 +42,15 @@ FactoryGirl.define do
 
   factory :user do
     sequence(:email) { |n| "username_#{n}@example.com" }
-    sequence(:password) { |n| 'password' }
+    sequence(:password) { |_n| 'password' }
   end
 
   factory :field_test do
   end
 
   factory :comment do
-    sequence(:content) do |n| <<-EOF
+    sequence(:content) do |n|
+      <<-EOF
         Lorém --#{n}-- ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
@@ -61,7 +62,7 @@ FactoryGirl.define do
   end
 
   factory :ball do
-    color(%W[red blue green yellow purple brown black white].sample)
+    color(%w(red blue green yellow purple brown black white).sample)
   end
 
   factory :hardball do

data/spec/helpers/rails_admin/application_helper_spec.rb

@@ -3,14 +3,14 @@ require 'cancan'
 
 class TestAbility
   include CanCan::Ability
-  def initialize(user)
+  def initialize(_user)
     can :access, :rails_admin
     can :edit, FieldTest
     cannot :edit, FieldTest, string_field: 'dangerous'
   end
 end
 
-describe RailsAdmin::ApplicationHelper do
+describe RailsAdmin::ApplicationHelper, type: :helper do
   describe '#authorized?' do
     before do
       allow(RailsAdmin.config).to receive(:_current_user).and_return(FactoryGirl.create(:user))
@@ -19,9 +19,9 @@ describe RailsAdmin::ApplicationHelper do
 
     it 'doesn\'t test unpersisted objects' do
       am = RailsAdmin.config(FieldTest).abstract_model
-      expect(helper.authorized?(:edit, am, FactoryGirl.create(:field_test, string_field: 'dangerous'))).to be_false
-      expect(helper.authorized?(:edit, am, FactoryGirl.create(:field_test, string_field: 'not-dangerous'))).to be_true
-      expect(helper.authorized?(:edit, am, FactoryGirl.build(:field_test, string_field: 'dangerous'))).to be_true
+      expect(helper.authorized?(:edit, am, FactoryGirl.create(:field_test, string_field: 'dangerous'))).to be_falsey
+      expect(helper.authorized?(:edit, am, FactoryGirl.create(:field_test, string_field: 'not-dangerous'))).to be_truthy
+      expect(helper.authorized?(:edit, am, FactoryGirl.build(:field_test, string_field: 'dangerous'))).to be_truthy
     end
   end
 
@@ -34,8 +34,8 @@ describe RailsAdmin::ApplicationHelper do
       it 'returns true if current_action, false otherwise' do
         @action = RailsAdmin::Config::Actions.find(:index)
 
-        expect(helper.current_action?(RailsAdmin::Config::Actions.find(:index))).to be_true
-        expect(helper.current_action?(RailsAdmin::Config::Actions.find(:show))).not_to be_true
+        expect(helper.current_action?(RailsAdmin::Config::Actions.find(:index))).to be_truthy
+        expect(helper.current_action?(RailsAdmin::Config::Actions.find(:show))).not_to be_truthy
       end
     end
 
@@ -298,7 +298,7 @@ describe RailsAdmin::ApplicationHelper do
       it 'shows links if defined' do
         RailsAdmin.config do |config|
           config.navigation_static_links = {
-            'Test Link' => 'http://www.google.com'
+            'Test Link' => 'http://www.google.com',
           }
         end
         expect(helper.static_navigation).to match(/Test Link/)
@@ -307,7 +307,7 @@ describe RailsAdmin::ApplicationHelper do
       it 'shows default header if navigation_static_label not defined in config' do
         RailsAdmin.config do |config|
           config.navigation_static_links = {
-            'Test Link' => 'http://www.google.com'
+            'Test Link' => 'http://www.google.com',
           }
         end
         expect(helper.static_navigation).to match(I18n.t('admin.misc.navigation_static_label'))
@@ -317,7 +317,7 @@ describe RailsAdmin::ApplicationHelper do
         RailsAdmin.config do |config|
           config.navigation_static_label = 'Test Header'
           config.navigation_static_links = {
-            'Test Link' => 'http://www.google.com'
+            'Test Link' => 'http://www.google.com',
           }
         end
         expect(helper.static_navigation).to match(/Test Header/)

data/spec/helpers/rails_admin/form_builder_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RailsAdmin::FormBuilder' do
+describe 'RailsAdmin::FormBuilder', type: :helper do
   describe '#generate' do
     before do
       allow(helper).to receive(:authorized?).and_return(true)

data/spec/integration/authorization/cancan_spec.rb

@@ -39,7 +39,7 @@ class AdminAbility
   end
 end
 
-describe 'RailsAdmin CanCan Authorization' do
+describe 'RailsAdmin CanCan Authorization', type: :request do
 
   subject { page }
 
@@ -75,9 +75,9 @@ describe 'RailsAdmin CanCan Authorization' 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')
+      is_expected.to have_content('Player')
+      is_expected.not_to have_content('League')
+      is_expected.not_to 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
@@ -94,14 +94,14 @@ describe 'RailsAdmin CanCan Authorization' do
 
       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 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_not have_css('.show_in_app_member_link')
+      is_expected.to have_content(@players[0].name)
+      is_expected.not_to have_content(@players[1].name)
+      is_expected.not_to have_content('Add new')
+      is_expected.to have_css('.show_member_link')
+      is_expected.not_to have_css('.edit_member_link')
+      is_expected.not_to have_css('.delete_member_link')
+      is_expected.not_to have_css('.history_show_member_link')
+      is_expected.not_to have_css('.show_in_app_member_link')
     end
 
     it 'GET /admin/team should raise CanCan::AccessDenied' do
@@ -122,15 +122,15 @@ describe 'RailsAdmin CanCan Authorization' do
     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')
+      is_expected.not_to have_content('Save and edit')
+      is_expected.not_to have_content('Delete')
 
-      should have_content('Save and add another')
+      is_expected.to 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')
+      is_expected.not_to have_content('Edit')
 
       @player = RailsAdmin::AbstractModel.new('Player').first
       expect(@player.name).to eq('Jackie Robinson')
@@ -154,12 +154,12 @@ describe 'RailsAdmin CanCan Authorization' 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')
+      is_expected.to have_content('Save and edit')
+      is_expected.not_to have_content('Save and add another')
+      is_expected.not_to have_content('Add new')
+      is_expected.not_to have_content('Delete')
+      is_expected.not_to have_content('History')
+      is_expected.not_to have_content('Show in app')
       fill_in 'player[name]', with: 'Jackie Robinson'
       click_button 'Save' # click_button "Save" # first(:button, "Save").click
       @player.reload
@@ -185,16 +185,16 @@ describe 'RailsAdmin CanCan Authorization' do
       @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')
+      is_expected.to have_css('.show_member_link')
+      is_expected.not_to have_css('.edit_member_link')
+      is_expected.not_to have_css('.delete_member_link')
+      is_expected.to 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')
+      is_expected.to have_content('Show')
+      is_expected.not_to have_content('Edit')
+      is_expected.not_to have_content('Delete')
+      is_expected.to have_content('History')
     end
   end
 
@@ -204,18 +204,18 @@ describe 'RailsAdmin CanCan Authorization' do
       @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')
+      is_expected.to have_css('.show_member_link')
+      is_expected.not_to have_css('.edit_member_link')
+      is_expected.not_to have_css('.delete_member_link')
+      is_expected.not_to have_css('.history_show_member_link')
+      is_expected.to 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')
+      is_expected.to have_content('Show')
+      is_expected.not_to have_content('Edit')
+      is_expected.not_to have_content('Delete')
+      is_expected.not_to have_content('History')
+      is_expected.to have_content('Show in app')
     end
   end
 
@@ -225,18 +225,18 @@ describe 'RailsAdmin CanCan Authorization' do
       @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')
+      is_expected.to have_css('.show_member_link')
+      is_expected.to have_css('.edit_member_link')
+      is_expected.to have_css('.delete_member_link')
+      is_expected.to have_css('.history_show_member_link')
+      is_expected.to 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')
+      is_expected.to have_content('Show')
+      is_expected.to have_content('Edit')
+      is_expected.to have_content('Delete')
+      is_expected.to have_content('History')
+      is_expected.to have_content('Show in app')
     end
   end
 

data/spec/integration/basic/bulk_action/rails_admin_basic_bulk_action_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RailsAdmin Basic Bulk Action' do
+describe 'RailsAdmin Basic Bulk Action', type: :request do
 
   subject { page }
 
@@ -19,7 +19,7 @@ describe 'RailsAdmin Basic Bulk Action' do
     it 'shows form for export' do
       visit index_path(model_name: 'player')
       click_link 'Export found Players'
-      @players.each { |player| should have_content('Select fields to export') }
+      @players.each { |_player| is_expected.to have_content('Select fields to export') }
     end
   end
 end

data/spec/integration/basic/bulk_destroy/rails_admin_basic_bulk_destroy_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RailsAdmin Basic Bulk Destroy' do
+describe 'RailsAdmin Basic Bulk Destroy', type: :request do
   subject { page }
 
   describe 'successful bulk delete of records', active_record: true do

data/spec/integration/basic/create/rails_admin_basic_create_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RailsAdmin Basic Create' do
+describe 'RailsAdmin Basic Create', type: :request do
   subject { page }
 
   describe 'create' do
@@ -9,7 +9,7 @@ describe 'RailsAdmin Basic Create' do
       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
+      click_button 'Save'
       @player = RailsAdmin::AbstractModel.new('Player').first
     end
 
@@ -64,7 +64,7 @@ describe 'RailsAdmin Basic Create' do
 
       post new_path(model_name: 'player', player: {name: 'Jackie Robinson', number: 42, position: 'Second baseman', draft_id: @draft.id})
 
-      @player = RailsAdmin::AbstractModel.new('Player').all.to_a.last # first is created by FactoryGirl
+      @player = RailsAdmin::AbstractModel.new('Player').all.to_a.detect { |player| player.name == 'Jackie Robinson' }
     end
 
     it 'creates an object with correct associations' do
@@ -134,7 +134,7 @@ describe 'RailsAdmin Basic Create' do
     end
 
     it 'shows error base error message in flash' do
-      should have_content('Player failed to be created. Player is cheating')
+      is_expected.to have_content('Player failed to be created. Player is cheating')
     end
   end
 end

data/spec/integration/basic/create/rails_admin_namespaced_model_create_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RailsAdmin Namespaced Model Create' do
+describe 'RailsAdmin Namespaced Model Create', type: :request do
 
   subject { page }
 

data/spec/integration/basic/delete/rails_admin_basic_delete_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RailsAdmin Basic Delete' do
+describe 'RailsAdmin Basic Delete', type: :request do
 
   subject { page }
 
@@ -10,10 +10,10 @@ describe 'RailsAdmin Basic Delete' do
       @player = @draft.player
       @comment = @player.comments.create
       visit delete_path(model_name: 'player', id: @player.id)
-      should have_content('delete this player')
-      should have_link(@player.name, href: "/admin/player/#{@player.id}")
-      should have_link("Draft ##{@draft.id}", href: "/admin/draft/#{@draft.id}")
-      should have_link("Comment ##{@comment.id}", href: "/admin/comment/#{@comment.id}")
+      is_expected.to have_content('delete this player')
+      is_expected.to have_link(@player.name, href: "/admin/player/#{@player.id}")
+      is_expected.to have_link("Draft ##{@draft.id}", href: "/admin/draft/#{@draft.id}")
+      is_expected.to have_link("Comment ##{@comment.id}", href: "/admin/comment/#{@comment.id}")
     end
   end
 
@@ -41,10 +41,10 @@ describe 'RailsAdmin Basic Delete' do
     end
 
     it "shows \"Delete model\"" do
-      should have_content('delete this player')
-      should_not have_selector("a[href=\"/admin/player/#{@player.id}\"]")
-      should_not have_selector("a[href=\"/admin/draft/#{@draft.id}\"]")
-      should_not have_selector("a[href=\"/admin/comment/#{@comment.id}\"]")
+      is_expected.to have_content('delete this player')
+      is_expected.not_to have_selector("a[href=\"/admin/player/#{@player.id}\"]")
+      is_expected.not_to have_selector("a[href=\"/admin/draft/#{@draft.id}\"]")
+      is_expected.not_to have_selector("a[href=\"/admin/comment/#{@comment.id}\"]")
     end
   end
 
@@ -56,9 +56,9 @@ describe 'RailsAdmin Basic Delete' do
     end
 
     it "shows \"Delete model\"" do
-      should_not have_content('Routing Error')
-      should have_content('delete this player')
-      should have_link(@player.name, href: "/admin/player/#{@player.id}")
+      is_expected.not_to have_content('Routing Error')
+      is_expected.to have_content('delete this player')
+      is_expected.to have_link(@player.name, href: "/admin/player/#{@player.id}")
     end
   end
 end