rails_admin 0.6.2 → 0.6.3

data/spec/integration/config/list/rails_admin_config_list_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RailsAdmin Config DSL List Section' do
+describe 'RailsAdmin Config DSL List Section', type: :request do
 
   subject { page }
 
@@ -13,8 +13,8 @@ describe 'RailsAdmin Config DSL List Section' do
       end
       FactoryGirl.create :team
       visit index_path(model_name: 'team')
-      should have_selector('th.header.string_type.name_field')
-      should have_selector('td.string_type.name_field')
+      is_expected.to have_selector('th.header.string_type.name_field')
+      is_expected.to have_selector('td.string_type.name_field')
     end
   end
 
@@ -34,9 +34,9 @@ describe 'RailsAdmin Config DSL List Section' do
         end
       end
       visit index_path(model_name: 'league')
-      should have_selector('tbody tr', count: 1)
+      is_expected.to have_selector('tbody tr', count: 1)
       visit index_path(model_name: 'player')
-      should have_selector('tbody tr', count: 2)
+      is_expected.to have_selector('tbody tr', count: 2)
     end
   end
 
@@ -137,7 +137,7 @@ describe 'RailsAdmin Config DSL List Section' do
       visit index_path(model_name: 'fan')
       expect(all('th').collect(&:text).delete_if { |t| /^\n*$/ =~ t }).
         to eq(['Id', 'Their Name'])
-      should have_no_selector('th:nth-child(4).header')
+      is_expected.to have_no_selector('th:nth-child(4).header')
     end
 
     it 'delegates the label option to the ActiveModel API' do
@@ -192,10 +192,10 @@ describe 'RailsAdmin Config DSL List Section' do
 
     it 'is sortable by default' do
       visit index_path(model_name: 'fan')
-      should have_selector('th:nth-child(2).header')
-      should have_selector('th:nth-child(3).header')
-      should have_selector('th:nth-child(4).header')
-      should have_selector('th:nth-child(5).header')
+      is_expected.to have_selector('th:nth-child(2).header')
+      is_expected.to have_selector('th:nth-child(3).header')
+      is_expected.to have_selector('th:nth-child(4).header')
+      is_expected.to have_selector('th:nth-child(5).header')
     end
 
     it 'has option to disable sortability' do
@@ -208,8 +208,8 @@ describe 'RailsAdmin Config DSL List Section' do
         end
       end
       visit index_path(model_name: 'fan')
-      should have_no_selector('th:nth-child(2).header')
-      should have_selector('th:nth-child(3).header')
+      is_expected.to have_no_selector('th:nth-child(2).header')
+      is_expected.to have_selector('th:nth-child(3).header')
     end
 
     it 'has option to disable sortability by type' do
@@ -225,10 +225,10 @@ describe 'RailsAdmin Config DSL List Section' do
         end
       end
       visit index_path(model_name: 'fan')
-      should have_selector('th:nth-child(2).header')
-      should have_selector('th:nth-child(3).header')
-      should have_no_selector('th:nth-child(4).header')
-      should have_no_selector('th:nth-child(5).header')
+      is_expected.to have_selector('th:nth-child(2).header')
+      is_expected.to have_selector('th:nth-child(3).header')
+      is_expected.to have_no_selector('th:nth-child(4).header')
+      is_expected.to have_no_selector('th:nth-child(5).header')
     end
 
     it 'has option to disable sortability by type globally' do
@@ -244,10 +244,10 @@ describe 'RailsAdmin Config DSL List Section' do
         end
       end
       visit index_path(model_name: 'fan')
-      should have_selector('th:nth-child(2).header')
-      should have_selector('th:nth-child(3).header')
-      should have_no_selector('th:nth-child(4).header')
-      should have_no_selector('th:nth-child(5).header')
+      is_expected.to have_selector('th:nth-child(2).header')
+      is_expected.to have_selector('th:nth-child(3).header')
+      is_expected.to have_no_selector('th:nth-child(4).header')
+      is_expected.to have_no_selector('th:nth-child(5).header')
     end
 
     it 'has option to hide fields by type' do
@@ -327,7 +327,7 @@ describe 'RailsAdmin Config DSL List Section' do
       end
       @fans = 2.times.collect { FactoryGirl.create :fan }
       visit index_path(model_name: 'fan')
-      should have_selector('tbody tr:nth-child(1) td:nth-child(4)', text: /\d{2} \w{3} \d{1,2}:\d{1,2}/)
+      is_expected.to have_selector('tbody tr:nth-child(1) td:nth-child(4)', text: /\d{2} \w{3} \d{1,2}:\d{1,2}/)
     end
 
     it 'has option to customize output formatting of date fields' do
@@ -343,7 +343,7 @@ describe 'RailsAdmin Config DSL List Section' do
       end
       @fans = 2.times.collect { FactoryGirl.create :fan }
       visit index_path(model_name: 'fan')
-      should have_selector('tbody tr:nth-child(1) td:nth-child(4)', text: /\d{4}-\d{2}-\d{2}/)
+      is_expected.to have_selector('tbody tr:nth-child(1) td:nth-child(4)', text: /\d{4}-\d{2}-\d{2}/)
     end
 
     it 'allows addition of virtual fields (object methods)' do
@@ -357,7 +357,7 @@ describe 'RailsAdmin Config DSL List Section' do
       @team = FactoryGirl.create :team
       @players = 2.times.collect { FactoryGirl.create :player, team: @team }
       visit index_path(model_name: 'team')
-      expect(find('tbody tr:nth-child(1) td:nth-child(4)')).to have_content(@players.collect(&:name).join(', '))
+      expect(find('tbody tr:nth-child(1) td:nth-child(4)')).to have_content(@players.sort_by(&:id).collect(&:name).join(', '))
     end
   end
 
@@ -433,8 +433,8 @@ describe 'RailsAdmin Config DSL List Section' do
       @record = FactoryGirl.create :field_test
       2.times.each { |i| @record.embeds.create name: "embed #{i}" }
       visit index_path(model_name: 'field_test')
-      should_not have_link('embed 0')
-      should_not have_link('embed 1')
+      is_expected.not_to have_link('embed 0')
+      is_expected.not_to have_link('embed 1')
     end
   end
 end

data/spec/integration/config/show/rails_admin_config_show_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RailsAdmin Config DSL Show Section' do
+describe 'RailsAdmin Config DSL Show Section', type: :request do
   subject { page }
   let(:team) { FactoryGirl.create :team }
 
@@ -36,7 +36,7 @@ describe 'RailsAdmin Config DSL Show Section' do
     it 'hides empty fields in show view by default' do
       @player = FactoryGirl.create :player
       visit show_path(model_name: 'league', id: @player.id)
-      should_not have_css('.born_on_field')
+      is_expected.not_to have_css('.born_on_field')
     end
 
     it 'is disactivable' do
@@ -46,13 +46,13 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       @player = FactoryGirl.create :player
       visit show_path(model_name: 'player', id: @player.id)
-      should have_css('.born_on_field')
+      is_expected.to have_css('.born_on_field')
     end
   end
 
   describe 'bindings' do
     it 'should be present' do
-      RailsAdmin.config Team do |c|
+      RailsAdmin.config Team do |_c|
         show do
           field :name do
             show do
@@ -64,7 +64,7 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should have_selector('dt .name_field.string_type')
+      is_expected.to have_selector('dt .name_field.string_type')
     end
   end
 
@@ -72,7 +72,7 @@ describe 'RailsAdmin Config DSL Show Section' do
     it 'is present' do
       do_request
 
-      should have_selector('dt .name_field.string_type')
+      is_expected.to have_selector('dt .name_field.string_type')
     end
   end
 
@@ -88,13 +88,13 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should_not have_selector('h4', text: 'Basic info')
+      is_expected.not_to have_selector('h4', text: 'Basic info')
 
-      %w[division name logo_url manager
+      %w(division name logo_url manager
          ballpark mascot founded wins
          losses win_percentage revenue
-      ].each do |field|
-        should_not have_selector(".#{field}_field")
+      ).each do |field|
+        is_expected.not_to have_selector(".#{field}_field")
       end
     end
 
@@ -109,7 +109,7 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should_not have_selector('h4', text: 'Players')
+      is_expected.not_to have_selector('h4', text: 'Players')
     end
 
     it 'is renameable' do
@@ -123,7 +123,7 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should have_selector('h4', text: 'Renamed group')
+      is_expected.to have_selector('h4', text: 'Renamed group')
     end
 
     it 'has accessor for its fields' do
@@ -142,12 +142,12 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should have_selector('h4', text: 'Basic info')
-      should have_selector('h4', text: "Belong's to associations")
+      is_expected.to have_selector('h4', text: 'Basic info')
+      is_expected.to have_selector('h4', text: "Belong's to associations")
 
-      should have_selector('.name_field')
-      should have_selector('.logo_url_field')
-      should have_selector('.division_field')
+      is_expected.to have_selector('.name_field')
+      is_expected.to have_selector('.logo_url_field')
+      is_expected.to have_selector('.division_field')
     end
 
     it 'has accessor for its fields by type' do
@@ -170,11 +170,11 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should have_selector('.label', text: 'Name')
-      should have_selector('.label', text: 'Logo url')
-      should have_selector('.label', text: 'Division')
-      should have_selector('.label', text: 'Manager (STRING)')
-      should have_selector('.label', text: 'Ballpark (STRING)')
+      is_expected.to have_selector('.label', text: 'Name')
+      is_expected.to have_selector('.label', text: 'Logo url')
+      is_expected.to have_selector('.label', text: 'Division')
+      is_expected.to have_selector('.label', text: 'Manager (STRING)')
+      is_expected.to have_selector('.label', text: 'Ballpark (STRING)')
     end
   end
 
@@ -183,11 +183,11 @@ describe 'RailsAdmin Config DSL Show Section' do
     it 'shows all by default' do
       do_request
 
-      %w[division name logo_url manager
+      %w(division name logo_url manager
          ballpark mascot founded wins
          losses win_percentage revenue players fans
-      ].each do |field|
-        should have_selector(".#{field}_field")
+      ).each do |field|
+        is_expected.to have_selector(".#{field}_field")
       end
     end
 
@@ -202,9 +202,9 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should have_selector('.manager_field')
-      should have_selector('.division_field')
-      should have_selector('.name_field')
+      is_expected.to have_selector('.manager_field')
+      is_expected.to have_selector('.division_field')
+      is_expected.to have_selector('.name_field')
     end
 
     it 'delegates the label option to the ActiveModel API' do
@@ -217,8 +217,8 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should have_selector('.label', text: 'Team Manager')
-      should have_selector('.label', text: 'Some Fans')
+      is_expected.to have_selector('.label', text: 'Team Manager')
+      is_expected.to have_selector('.label', text: 'Some Fans')
     end
 
     it 'is renameable' do
@@ -234,9 +234,9 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should have_selector('.label', text: 'Renamed field')
-      should have_selector('.label', text: 'Division')
-      should have_selector('.label', text: 'Name')
+      is_expected.to have_selector('.label', text: 'Renamed field')
+      is_expected.to have_selector('.label', text: 'Division')
+      is_expected.to have_selector('.label', text: 'Name')
     end
 
     it 'is renameable by type' do
@@ -254,7 +254,7 @@ describe 'RailsAdmin Config DSL Show Section' do
        'Ballpark (STRING)', 'Mascot (STRING)', 'Founded', 'Wins', 'Losses',
        'Win percentage', 'Revenue', 'Players', 'Fans'
       ].each do |text|
-        should have_selector('.label', text: text)
+        is_expected.to have_selector('.label', text: text)
       end
     end
 
@@ -273,7 +273,7 @@ describe 'RailsAdmin Config DSL Show Section' do
        'Ballpark (STRING)', 'Mascot (STRING)', 'Founded', 'Wins', 'Losses',
        'Win percentage', 'Revenue', 'Players', 'Fans'
       ].each do |text|
-        should have_selector('.label', text: text)
+        is_expected.to have_selector('.label', text: text)
       end
     end
 
@@ -290,8 +290,8 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      should have_selector('.division_field')
-      should have_selector('.name_field')
+      is_expected.to have_selector('.division_field')
+      is_expected.to have_selector('.name_field')
     end
 
     it 'is hideable by type' do
@@ -305,12 +305,12 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      %w[Name Logo\ url Manager Ballpark Mascot].each do |text|
-        should_not have_selector('.label', text: text)
+      %w(Name Logo\ url Manager Ballpark Mascot).each do |text|
+        is_expected.not_to have_selector('.label', text: text)
       end
 
-      %w[Division Founded Wins Losses Win\ percentage Revenue Players Fans].each do |text|
-        should have_selector('.label', text: text)
+      %w(Division Founded Wins Losses Win\ percentage Revenue Players Fans).each do |text|
+        is_expected.to have_selector('.label', text: text)
       end
     end
 
@@ -325,12 +325,12 @@ describe 'RailsAdmin Config DSL Show Section' do
 
       do_request
 
-      %w[Name Logo\ url Manager Ballpark Mascot].each do |text|
-        should_not have_selector('.label', text: text)
+      %w(Name Logo\ url Manager Ballpark Mascot).each do |text|
+        is_expected.not_to have_selector('.label', text: text)
       end
 
-      %w[Division Founded Wins Losses Win\ percentage Revenue Players Fans].each do |text|
-        should have_selector('.label', text: text)
+      %w(Division Founded Wins Losses Win\ percentage Revenue Players Fans).each do |text|
+        is_expected.to have_selector('.label', text: text)
       end
     end
   end
@@ -340,8 +340,8 @@ describe 'RailsAdmin Config DSL Show Section' do
       @record = FactoryGirl.create :field_test
       2.times.each { |i| @record.embeds.create name: "embed #{i}" }
       visit show_path(model_name: 'field_test', id: @record.id)
-      should_not have_link('embed 0')
-      should_not have_link('embed 1')
+      is_expected.not_to have_link('embed 0')
+      is_expected.not_to have_link('embed 1')
     end
   end
 end

data/spec/integration/history/rails_admin_history_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RailsAdmin History', active_record: true do
+describe 'RailsAdmin History', type: :request, active_record: true do
   describe 'model history fetch' do
     before :each do
       RailsAdmin::History.delete_all

data/spec/integration/rails_admin_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe RailsAdmin do
+describe RailsAdmin, type: :request do
 
   subject { page }
 
@@ -9,7 +9,7 @@ describe RailsAdmin do
     RailsAdmin::Config.current_user_method(&:current_user)
     login_as User.create(
       email: 'username@example.com',
-      password: 'password'
+      password: 'password',
     )
   end
 
@@ -21,8 +21,8 @@ describe RailsAdmin do
       RailsAdmin.config.included_models = []
       visit dashboard_path
 
-      should have_content('Site Administration')
-      should have_content('Dashboard')
+      is_expected.to have_content('Site Administration')
+      is_expected.to have_content('Dashboard')
     end
   end
 
@@ -32,11 +32,11 @@ describe RailsAdmin do
     # Note: the [href^="/asset... syntax matches the start of a value. The reason
     # we just do that is to avoid being confused by rails' asset_ids.
     it 'loads stylesheets in header' do
-      should have_selector('head link[href^="/assets/rails_admin/rails_admin.css"]', visible: false)
+      is_expected.to have_selector('head link[href^="/assets/rails_admin/rails_admin.css"]', visible: false)
     end
 
     it 'loads javascript files in body' do
-      should have_selector('head script[src^="/assets/rails_admin/rails_admin.js"]', visible: false)
+      is_expected.to have_selector('head script[src^="/assets/rails_admin/rails_admin.js"]', visible: false)
     end
   end
 
@@ -57,16 +57,16 @@ describe RailsAdmin do
 
     it 'shows up with default value, hidden' do
       visit new_path(model_name: 'player')
-      should have_selector("#player_name[type=hidden][value='username@example.com']")
-      should_not have_selector("#player_name[type=hidden][value='toto@example.com']")
+      is_expected.to have_selector("#player_name[type=hidden][value='username@example.com']")
+      is_expected.not_to have_selector("#player_name[type=hidden][value='toto@example.com']")
     end
 
     it 'does not show label' do
-      should_not have_selector('label', text: 'Name')
+      is_expected.not_to have_selector('label', text: 'Name')
     end
 
     it 'does not show help block' do
-      should_not have_xpath("id('player_name')/../p[@class='help-block']")
+      is_expected.not_to have_xpath("id('player_name')/../p[@class='help-block']")
     end
   end
 
@@ -91,8 +91,8 @@ describe RailsAdmin do
       end
 
       visit index_path(model_name: 'player')
-      should have_selector('.header.name_field')
-      should_not have_selector('.header.team_field')
+      is_expected.to have_selector('.header.name_field')
+      is_expected.not_to have_selector('.header.team_field')
     end
   end
 
@@ -105,46 +105,46 @@ describe RailsAdmin do
     it 'works like belongs to associations in the list view' do
       visit index_path(model_name: 'comment')
 
-      should have_content(@team.name)
+      is_expected.to have_content(@team.name)
     end
 
     it 'is editable' do
       visit edit_path(model_name: 'comment', id: @comment.id)
 
-      should have_selector('select#comment_commentable_type')
-      should have_selector('select#comment_commentable_id')
+      is_expected.to have_selector('select#comment_commentable_type')
+      is_expected.to have_selector('select#comment_commentable_id')
     end
 
     it 'is visible in the owning end' do
       visit edit_path(model_name: 'team', id: @team.id)
 
-      should have_selector('select#team_comment_ids')
+      is_expected.to have_selector('select#team_comment_ids')
     end
   end
 
   describe 'secondary navigation' do
     it 'has Gravatar image' do
       visit dashboard_path
-      should have_selector('ul.nav.pull-right li img')
+      is_expected.to have_selector('ul.nav.pull-right li img')
     end
 
     it "does not show Gravatar when user doesn't have email method" do
       allow_any_instance_of(User).to receive(:respond_to?).and_return(true)
       allow_any_instance_of(User).to receive(:respond_to?).with(:email).and_return(false)
       visit dashboard_path
-      should_not have_selector('ul.nav.pull-right li img')
+      is_expected.not_to have_selector('ul.nav.pull-right li img')
     end
 
     it 'does not cause error when email is nil' do
       allow_any_instance_of(User).to receive(:respond_to?).and_return(true)
       allow_any_instance_of(User).to receive(:respond_to?).with(:email).and_return(nil)
       visit dashboard_path
-      should have_selector('body.rails_admin')
+      is_expected.to have_selector('body.rails_admin')
     end
 
     it 'shows a log out link' do
       visit dashboard_path
-      should have_content 'Log out'
+      is_expected.to have_content 'Log out'
     end
   end
 end