rails_admin 0.1.1 → 0.1.2

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

@@ -23,7 +23,7 @@ describe "RailsAdmin Basic Delete" do
     end
 
     it "should raise NotFound" do
-      page.driver.status_code.should eql(404)
+      expect(page.driver.status_code).to eq(404)
     end
   end
 

data/spec/integration/basic/destroy/rails_admin_basic_destroy_spec.rb

@@ -13,7 +13,7 @@ describe "RailsAdmin Basic Destroy" do
     end
 
     it "should destroy an object" do
-      @player.should be_nil
+      expect(@player).to be_nil
     end
 
     it "should show success message" do
@@ -30,7 +30,7 @@ describe "RailsAdmin Basic Destroy" do
     end
 
     it "should not destroy an object" do
-      @player.reload.should be
+      expect(@player.reload).to be
     end
 
     it "should show error message" do
@@ -47,7 +47,7 @@ describe "RailsAdmin Basic Destroy" do
     end
 
     it "should not destroy an object" do
-      @player.should be
+      expect(@player).to be
     end
   end
 
@@ -57,7 +57,7 @@ describe "RailsAdmin Basic Destroy" do
     end
 
     it "should raise NotFound" do
-      page.driver.status_code.should eql(404)
+      expect(page.driver.status_code).to eq(404)
     end
   end
 
@@ -68,7 +68,7 @@ describe "RailsAdmin Basic Destroy" do
       visit delete_path(:model_name => "player", :id => @player.id)
       click_button "Yes, I'm sure"
 
-      URI.parse(page.current_url).path.should ==(index_path(:model_name => 'player'))
+      expect(URI.parse(page.current_url).path).to eq(index_path(:model_name => 'player'))
     end
 
     it 'should redirect back to the object on error' do
@@ -78,7 +78,7 @@ describe "RailsAdmin Basic Destroy" do
       visit delete_path(:model_name => "player", :id => @player.id)
       click_button "Yes, I'm sure"
 
-      URI.parse(page.current_url).path.should ==(show_path(:model_name => 'player', :id => @player.id))
+      expect(URI.parse(page.current_url).path).to eq(show_path(:model_name => 'player', :id => @player.id))
     end
   end
 end

data/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb

@@ -20,9 +20,9 @@ describe "RailsAdmin Basic Edit" do
     end
 
     it "should show non-required fields as \"Optional\"" do
-      find("#player_position_field .help-block").should have_content("Optional")
-      find("#player_born_on_field .help-block").should have_content("Optional")
-      find("#player_notes_field .help-block").should have_content("Optional")
+      expect(find("#player_position_field .help-block")).to have_content("Optional")
+      expect(find("#player_born_on_field .help-block")).to have_content("Optional")
+      expect(find("#player_notes_field .help-block")).to have_content("Optional")
     end
   end
 
@@ -59,9 +59,9 @@ describe "RailsAdmin Basic Edit" do
 
     it "should show associated objects" do
       should have_selector "#fan_team_ids" do |select|
-        select[0].should have_selector 'option[selected="selected"]'
-        select[1].should_not have_selector 'option[selected="selected"]'
-        select[2].should_not have_selector 'option[selected="selected"]'
+        expect(select[0]).to have_selector 'option[selected="selected"]'
+        expect(select[1]).not_to have_selector 'option[selected="selected"]'
+        expect(select[2]).not_to have_selector 'option[selected="selected"]'
       end
     end
   end
@@ -72,7 +72,7 @@ describe "RailsAdmin Basic Edit" do
     end
 
     it "should raise NotFound" do
-      page.driver.status_code.should eql(404)
+      expect(page.driver.status_code).to eq(404)
     end
   end
 
@@ -103,7 +103,7 @@ describe "RailsAdmin Basic Edit" do
       visit '/admin/ball?sort=color'
       click_link 'Edit'
       click_button 'Cancel'
-      page.current_url.should == 'http://www.example.com/admin/ball?sort=color'
+      expect(page.current_url).to eq('http://www.example.com/admin/ball?sort=color')
     end
   end
 end

data/spec/integration/basic/export/rails_admin_basic_export_spec.rb

@@ -47,7 +47,7 @@ describe "RailsAdmin Export" do
       select "<comma> ','", :from => "csv_options_generator_col_sep"
       click_button 'Export to csv'
       csv = CSV.parse find('body').text
-      csv[0].should =~ ["Id", "Created at", "Updated at", "Deleted at", "Name", "Position",
+      expect(csv[0]).to match_array ["Id", "Created at", "Updated at", "Deleted at", "Name", "Position",
         "Number", "Retired", "Injured", "Born on", "Notes", "Suspended", "Id [Team]", "Created at [Team]",
         "Updated at [Team]", "Name [Team]", "Logo url [Team]", "Team Manager [Team]", "Ballpark [Team]",
         "Mascot [Team]", "Founded [Team]", "Wins [Team]", "Losses [Team]", "Win percentage [Team]",
@@ -55,12 +55,12 @@ describe "RailsAdmin Export" do
         "Updated at [Draft]", "Date [Draft]", "Round [Draft]", "Pick [Draft]", "Overall [Draft]",
         "College [Draft]", "Notes [Draft]", "Id [Comments]", "Content [Comments]", "Created at [Comments]",
         "Updated at [Comments]"]
-      csv.flatten.should include(@player.name + " exported")
-      csv.flatten.should include(@player.team.name)
-      csv.flatten.should include(@player.draft.college)
+      expect(csv.flatten).to include(@player.name + " exported")
+      expect(csv.flatten).to include(@player.team.name)
+      expect(csv.flatten).to include(@player.draft.college)
 
-      csv.flatten.join(' ').should include(@player.comments.first.content.split("\n").first.strip)
-      csv.flatten.join(' ').should include(@player.comments.second.content.split("\n").first.strip)
+      expect(csv.flatten.join(' ')).to include(@player.comments.first.content.split("\n").first.strip)
+      expect(csv.flatten.join(' ')).to include(@player.comments.second.content.split("\n").first.strip)
     end
 
     it "should allow to export to JSON" do
@@ -88,10 +88,10 @@ describe "RailsAdmin Export" do
       select "<comma> ','", :from => "csv_options_generator_col_sep"
       click_button 'Export to csv'
       csv = CSV.parse find('body').text
-      csv[0].should =~ ["Id", "Commentable", "Commentable type", "Content", "Created at", "Updated at"]
+      expect(csv[0]).to match_array ["Id", "Commentable", "Commentable type", "Content", "Created at", "Updated at"]
       csv[1..-1].each do |line|
-        line[csv[0].index('Commentable')].should == @player.id.to_s
-        line[csv[0].index('Commentable type')].should == @player.class.to_s
+        expect(line[csv[0].index('Commentable')]).to eq(@player.id.to_s)
+        expect(line[csv[0].index('Commentable type')]).to eq(@player.class.to_s)
       end
     end
   end
@@ -100,7 +100,7 @@ describe "RailsAdmin Export" do
     it "should export with modified schema" do
       page.driver.post(export_path(:model_name => 'player', :schema => @non_default_schema, :csv => true, :all => true, :csv_options => { :generator => { :col_sep => "," } }))
       csv = CSV.parse find('body').text
-      csv[0].should_not include('Created at')
+      expect(csv[0]).not_to include('Created at')
     end
   end
 end

data/spec/integration/basic/list/rails_admin_basic_list_spec.rb

@@ -15,16 +15,16 @@ describe "RailsAdmin Basic List" do
   describe "GET /admin/typo" do
     it "should redirect to dashboard and inform the user the model wasn't found" do
       visit '/admin/whatever'
-      page.driver.status_code.should eql(404)
-      find('.alert-error').should have_content("Model 'Whatever' could not be found")
+      expect(page.driver.status_code).to eq(404)
+      expect(find('.alert-error')).to have_content("Model 'Whatever' could not be found")
     end
   end
 
   describe "GET /admin/balls/545-typo" do
     it "should redirect to balls index and inform the user the id wasn't found" do
       visit '/admin/ball/545-typo'
-      page.driver.status_code.should eql(404)
-      find('.alert-error').should have_content("Ball with id '545-typo' could not be found")
+      expect(page.driver.status_code).to eq(404)
+      expect(find('.alert-error')).to have_content("Ball with id '545-typo' could not be found")
     end
   end
 
@@ -286,9 +286,9 @@ describe "RailsAdmin Basic List" do
     end
 
     it "should paginate correctly" do
-      find('.pagination ul li:first').should have_content("« Prev")
-      find('.pagination ul li:last').should have_content("Next »")
-      find('.pagination ul li.active').should have_content("2")
+      expect(find('.pagination ul li:first')).to have_content("« Prev")
+      expect(find('.pagination ul li:last')).to have_content("Next »")
+      expect(find('.pagination ul li.active')).to have_content("2")
     end
   end
 
@@ -300,9 +300,9 @@ describe "RailsAdmin Basic List" do
     end
 
     it "should paginate correctly and contain the right item" do
-      find('.pagination ul li:first').should have_content("« Prev")
-      find('.pagination ul li:last').should have_content("Next »")
-      find('.pagination ul li.active').should have_content("3")
+      expect(find('.pagination ul li:first')).to have_content("« Prev")
+      expect(find('.pagination ul li:last')).to have_content("Next »")
+      expect(find('.pagination ul li.active')).to have_content("3")
     end
   end
 
@@ -310,7 +310,7 @@ describe "RailsAdmin Basic List" do
     it "should respond successfully" do
       2.times.map { FactoryGirl.create :player }
       visit index_path(:model_name => "player", :all => true)
-      find('div.total-count').should have_content("2 players")
+      expect(find('div.total-count')).to have_content("2 players")
     end
   end
 
@@ -319,7 +319,7 @@ describe "RailsAdmin Basic List" do
       @team = FactoryGirl.create :team
       2.times.map { FactoryGirl.create :player, :team => @team }
       visit index_path(:model_name => "player", :associated_collection => "players", :compact => true, :current_action => 'update', :source_abstract_model => 'team', :source_object_id => @team.id)
-      find('div.total-count').should have_content("2 players")
+      expect(find('div.total-count')).to have_content("2 players")
     end
   end
 
@@ -327,10 +327,10 @@ describe "RailsAdmin Basic List" do
     it "should have_content an array with 2 elements and contain an array of elements with keys id and label" do
       2.times.map { FactoryGirl.create :player }
       response = page.driver.get(index_path(:model_name => "player", :compact => true, :format => :json))
-      ActiveSupport::JSON.decode(response.body).length.should eql(2)
+      expect(ActiveSupport::JSON.decode(response.body).length).to eq(2)
       ActiveSupport::JSON.decode(response.body).each do |object|
-        object.should have_key("id")
-        object.should have_key("label")
+        expect(object).to have_key("id")
+        expect(object).to have_key("label")
       end
     end
   end
@@ -339,7 +339,7 @@ describe "RailsAdmin Basic List" do
     let(:player) { FactoryGirl.create :player }
 
     before do
-      Player.count.should == 0
+      expect(Player.count).to eq(0)
     end
 
     it "finds the player if the query matches the default search opeartor" do

data/spec/integration/basic/new/rails_admin_basic_new_spec.rb

@@ -55,19 +55,19 @@ describe "RailsAdmin Basic New" do
   describe "GET /admin/player/new with parameters for pre-population" do
     it "should populate form field when corresponding parameters are passed in" do
       visit new_path(:model_name => 'player', :player => {:name => 'Sam'})
-      page.should have_css('input[value=Sam]')
+      expect(page).to have_css('input[value=Sam]')
     end
 
     it "should prepropulate belongs to relationships" do
       @team = FactoryGirl.create :team, :name => "belongs_to association prepopulated"
       visit new_path(:model_name => 'player', :associations => { :team => @team.id } )
-      page.should have_css("select#player_team_id option[selected='selected'][value='#{@team.id}']")
+      expect(page).to have_css("select#player_team_id option[selected='selected'][value='#{@team.id}']")
     end
 
     it "should prepropulate has_many relationships" do
       @player = FactoryGirl.create :player, :name => "has_many association prepopulated"
       visit new_path(:model_name => 'team', :associations => { :players => @player.id } )
-      page.should have_css("select#team_player_ids option[selected='selected'][value='#{@player.id}']")
+      expect(page).to have_css("select#team_player_ids option[selected='selected'][value='#{@player.id}']")
     end
   end
 

data/spec/integration/basic/new/rails_admin_namespaced_model_new_spec.rb

@@ -6,13 +6,13 @@ describe "RailsAdmin Namespaced Model New" do
 
   describe "AbstractModel#to_param" do
     it 'turns namespaces into prefixes with ~' do
-      RailsAdmin::AbstractModel.new("Cms::BasicPage").to_param.should == 'cms~basic_page'
+      expect(RailsAdmin::AbstractModel.new("Cms::BasicPage").to_param).to eq('cms~basic_page')
     end
   end
 
   describe "ApplicationController#to_model_name" do
     it 'turns cms~basic_page into Cms::BasicPage' do
-      RailsAdmin::ApplicationController.new.to_model_name('cms~basic_page').should == 'Cms::BasicPage'
+      expect(RailsAdmin::ApplicationController.new.to_model_name('cms~basic_page')).to eq('Cms::BasicPage')
     end
   end
 

data/spec/integration/basic/show/rails_admin_basic_show_spec.rb

@@ -22,11 +22,10 @@ describe "RailsAdmin Basic Show" do
   describe "GET /admin/players/123this-id-doesnt-exist" do
     it "should raise NotFound" do
       visit '/admin/players/123this-id-doesnt-exist'
-      page.driver.status_code.should eql(404)
+      expect(page.driver.status_code).to eq(404)
     end
   end
 
-
   describe "show with belongs_to association" do
     before(:each) do
       @player = FactoryGirl.create :player

data/spec/integration/basic/update/rails_admin_basic_update_spec.rb

@@ -13,7 +13,7 @@ describe "RailsAdmin Basic Update" do
     it "should return to edit page" do
       fill_in "player[name]", :with => ""
       click_button "Save"
-      page.driver.status_code.should eql(406)
+      expect(page.driver.status_code).to eq(406)
       should have_selector "form", :action => "/admin/players/#{@player.id}"
     end
   end
@@ -33,9 +33,9 @@ describe "RailsAdmin Basic Update" do
     end
 
     it "should update an object with correct attributes" do
-      @player.name.should eql("Jackie Robinson")
-      @player.number.should eql(42)
-      @player.position.should eql("Second baseman")
+      expect(@player.name).to eq("Jackie Robinson")
+      expect(@player.number).to eq(42)
+      expect(@player.position).to eq("Second baseman")
     end
   end
 
@@ -54,9 +54,9 @@ describe "RailsAdmin Basic Update" do
     end
 
     it "should update an object with correct attributes" do
-      @player.name.should eql("Jackie Robinson")
-      @player.number.should eql(42)
-      @player.position.should eql("Second baseman")
+      expect(@player.name).to eq("Jackie Robinson")
+      expect(@player.number).to eq(42)
+      expect(@player.position).to eq("Second baseman")
     end
   end
 
@@ -70,14 +70,14 @@ describe "RailsAdmin Basic Update" do
     end
 
     it "should update an object with correct attributes" do
-      @player.name.should eql("Jackie Robinson")
-      @player.number.should eql(@number)
-      @player.position.should eql("Second baseman")
+      expect(@player.name).to eq("Jackie Robinson")
+      expect(@player.number).to eq(@number)
+      expect(@player.position).to eq("Second baseman")
     end
 
     it "should update an object with correct associations" do
       @draft.reload
-      @player.draft.should eql(@draft)
+      expect(@player.draft).to eq(@draft)
     end
   end
 
@@ -93,19 +93,19 @@ describe "RailsAdmin Basic Update" do
       page.driver.put edit_path(:model_name => "league", :id => @league.id, :league => {:name => "National League", :division_ids => [@divisions[0].id] })
 
       @league.reload
-      @league.name.should eql("National League")
+      expect(@league.name).to eq("National League")
       @divisions[0].reload
-      @league.divisions.should include(@divisions[0])
-      @league.divisions.should_not include(@divisions[1])
-      @league.divisions.should_not include(@divisions[2])
+      expect(@league.divisions).to include(@divisions[0])
+      expect(@league.divisions).not_to include(@divisions[1])
+      expect(@league.divisions).not_to include(@divisions[2])
 
-      RailsAdmin::History.where(:item => @league.id).collect(&:message).should include("Added Divisions ##{@divisions[0].id} associations, Changed name")
+      expect(RailsAdmin::History.where(:item => @league.id).collect(&:message)).to include("Added Divisions ##{@divisions[0].id} associations, Changed name")
 
       page.driver.put edit_path(:model_name => "league", :id => @league.id, :league => {:division_ids => [""]})
 
       @league.reload
-      @league.divisions.should be_empty
-      RailsAdmin::History.where(:item => @league.id).collect(&:message).should include("Removed Divisions ##{@divisions[0].id} associations")
+      expect(@league.divisions).to be_empty
+      expect(RailsAdmin::History.where(:item => @league.id).collect(&:message)).to include("Removed Divisions ##{@divisions[0].id} associations")
     end
   end
 
@@ -115,7 +115,7 @@ describe "RailsAdmin Basic Update" do
     end
 
     it "should raise NotFound" do
-      page.driver.status_code.should eql(404)
+      expect(page.driver.status_code).to eq(404)
     end
   end
 
@@ -137,7 +137,7 @@ describe "RailsAdmin Basic Update" do
       # TODO: Mongoid 3.0.0 lacks ability of numericality validation on Integer field.
       # This is caused by change in https://github.com/mongoid/mongoid/pull/1698
       # I believe this should be a bug in Mongoid.
-      body.should have_content("Player failed to be updated") unless CI_ORM == :mongoid && Mongoid::VERSION >= '3.0.0'
+      expect(body).to have_content("Player failed to be updated") unless CI_ORM == :mongoid && Mongoid::VERSION >= '3.0.0'
     end
   end
 
@@ -160,7 +160,7 @@ describe "RailsAdmin Basic Update" do
     end
 
     it "should save the serialized data" do
-      @user.roles.should eql(['admin','user'])
+      expect(@user.roles).to eq(['admin','user'])
     end
   end
 
@@ -177,8 +177,8 @@ describe "RailsAdmin Basic Update" do
       click_button "Save"
 
       @field_test.reload
-      @field_test.array_field.should eql([4, 2])
-      @field_test.hash_field.should eql({ "a" => 6, "b" => 2 })
+      expect(@field_test.array_field).to eq([4, 2])
+      expect(@field_test.hash_field).to eq({ "a" => 6, "b" => 2 })
     end
 
     it "should clear data when empty string is passed" do
@@ -187,8 +187,8 @@ describe "RailsAdmin Basic Update" do
       click_button "Save"
 
       @field_test.reload
-      @field_test.array_field.should eql(nil)
-      @field_test.hash_field.should eql(nil)
+      expect(@field_test.array_field).to eq(nil)
+      expect(@field_test.hash_field).to eq(nil)
     end
   end
 
@@ -205,7 +205,7 @@ describe "RailsAdmin Basic Update" do
     end
 
     it "should update an object with correct attributes" do
-      @ball.color.should eql("gray")
+      expect(@ball.color).to eq("gray")
     end
   end
 
@@ -222,7 +222,7 @@ describe "RailsAdmin Basic Update" do
     end
 
     it "should update an object with correct attributes" do
-      @hardball.color.should eql("cyan")
+      expect(@hardball.color).to eq("cyan")
     end
   end
 

data/spec/integration/config/edit/rails_admin_config_edit_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe "RailsAdmin Config DSL Edit Section" do
 
   subject { page }
-  
+
   describe " a field with 'format' as a name (Kernel function)" do
 
     it "should be updatable without any error" do
@@ -18,7 +18,7 @@ describe "RailsAdmin Config DSL Edit Section" do
       fill_in "field_test[format]", :with => "test for format"
       click_button "Save"
       @record = RailsAdmin::AbstractModel.new("FieldTest").first
-      @record.format.should eql("test for format")
+      expect(@record.format).to eq("test for format")
     end
   end
 
@@ -49,10 +49,10 @@ describe "RailsAdmin Config DSL Edit Section" do
       # but Capybara's RackTest driver is not up to this behavior change.
       # (https://github.com/jnicklas/capybara/issues/677)
       # So we manually cut off first newline character as a workaround here.
-      find_field('field_test[string_field]').value.gsub(/^\n/, '').should == 'string_field default_value'
-      find_field('field_test[text_field]').value.gsub(/^\n/, '').should == 'string_field text_field'
-      find_field('field_test[date_field]').value.should == Date.today.to_s
-      has_checked_field?('field_test[boolean_field]').should be_true
+      expect(find_field('field_test[string_field]').value.gsub(/^\n/, '')).to eq('string_field default_value')
+      expect(find_field('field_test[text_field]').value.gsub(/^\n/, '')).to eq('string_field text_field')
+      expect(find_field('field_test[date_field]').value).to eq(Date.today.to_s)
+      expect(has_checked_field?('field_test[boolean_field]')).to be_true
     end
 
     it "should set default value for selects" do
@@ -65,7 +65,7 @@ describe "RailsAdmin Config DSL Edit Section" do
         end
       end
       visit new_path(:model_name => "team")
-      find_field('team[color]').value.should == 'black'
+      expect(find_field('team[color]').value).to eq('black')
     end
   end
 
@@ -95,8 +95,8 @@ describe "RailsAdmin Config DSL Edit Section" do
       should have_no_selector "field_test[protected_field]"
       click_button "Save"
       @field_test = FieldTest.first
-      @field_test.string_field.should == "No problem here"
-      @field_test.restricted_field.should == "I'm allowed to do that as :custom_role only"
+      expect(@field_test.string_field).to eq("No problem here")
+      expect(@field_test.restricted_field).to eq("I'm allowed to do that as :custom_role only")
     end
   end
 
@@ -182,19 +182,19 @@ describe "RailsAdmin Config DSL Edit Section" do
       context "using mongoid", :skip_active_record => true do
         it "should use the db column size for the maximum length" do
           visit new_path(:model_name => "help_test")
-          find("#help_test_name_field .help-block").should have_content("Length up to 255.")
+          expect(find("#help_test_name_field .help-block")).to have_content("Length up to 255.")
         end
 
         it "should return nil for the maximum length" do
           visit new_path(:model_name => "team")
-          find("#team_custom_field_field .help-block").should_not have_content("Length")
+          expect(find("#team_custom_field_field .help-block")).not_to have_content("Length")
         end
       end
 
       context "using active_record", :skip_mongoid => true do
         it "should use the db column size for the maximum length" do
           visit new_path(:model_name => "help_test")
-          find("#help_test_name_field .help-block").should have_content("Length up to 50.")
+          expect(find("#help_test_name_field .help-block")).to have_content("Length up to 50.")
         end
 
         it "should use the :minimum setting from the validation" do
@@ -202,7 +202,7 @@ describe "RailsAdmin Config DSL Edit Section" do
             validates_length_of :name, :minimum => 1
           end
           visit new_path(:model_name => "help_test")
-          find("#help_test_name_field .help-block").should have_content("Length of 1-50.")
+          expect(find("#help_test_name_field .help-block")).to have_content("Length of 1-50.")
         end
 
         it "should use the minimum of db column size or :maximum setting from the validation" do
@@ -210,7 +210,7 @@ describe "RailsAdmin Config DSL Edit Section" do
             validates_length_of :name, :maximum => 51
           end
           visit new_path(:model_name => "help_test")
-          find("#help_test_name_field .help-block").should have_content("Length up to 50.")
+          expect(find("#help_test_name_field .help-block")).to have_content("Length up to 50.")
         end
       end
 
@@ -263,7 +263,7 @@ describe "RailsAdmin Config DSL Edit Section" do
           validates_length_of :name, :is => 3
         end
         visit new_path(:model_name => "help_test")
-        find("#help_test_name_field .help-block").should have_content("Length of 3.")
+        expect(find("#help_test_name_field .help-block")).to have_content("Length of 3.")
       end
 
       it "should use the :maximum setting from the validation" do
@@ -271,7 +271,7 @@ describe "RailsAdmin Config DSL Edit Section" do
           validates_length_of :name, :maximum => 49
         end
         visit new_path(:model_name => "help_test")
-        find("#help_test_name_field .help-block").should have_content("Length up to 49.")
+        expect(find("#help_test_name_field .help-block")).to have_content("Length up to 49.")
       end
 
       it "should use the :minimum and :maximum from the validation" do
@@ -279,7 +279,7 @@ describe "RailsAdmin Config DSL Edit Section" do
           validates_length_of :name, :minimum => 1, :maximum => 49
         end
         visit new_path(:model_name => "help_test")
-        find("#help_test_name_field .help-block").should have_content("Length of 1-49.")
+        expect(find("#help_test_name_field .help-block")).to have_content("Length of 1-49.")
       end
 
       it "should use the range from the validation" do
@@ -287,7 +287,7 @@ describe "RailsAdmin Config DSL Edit Section" do
           validates_length_of :name, :in => 1..49
         end
         visit new_path(:model_name => "help_test")
-        find("#help_test_name_field .help-block").should have_content("Length of 1-49.")
+        expect(find("#help_test_name_field .help-block")).to have_content("Length of 1-49.")
       end
 
     end
@@ -311,9 +311,9 @@ describe "RailsAdmin Config DSL Edit Section" do
       visit new_path(:model_name => "team")
       should have_selector("legend", :text => "Basic info")
       all("legend", :text => "Basic info").tap do |nodes|
-        nodes.count.should == 2
-        nodes.first.visible?.should be_false
-        nodes.last.visible?.should be_true
+        expect(nodes.count).to eq(2)
+        expect(nodes.first.visible?).to be_false
+        expect(nodes.last.visible?).to be_true
       end
       should have_selector("legend", :text => "Belong's to associations")
       should have_selector("label", :text => "Name")
@@ -565,9 +565,9 @@ describe "RailsAdmin Config DSL Edit Section" do
         end
       end
       visit new_path(:model_name => "team")
-      find("#team_manager_field .help-block").should have_content("Required. Length up to 100. Additional help text for manager field.")
-      find("#team_division_id_field .help-block").should have_content("Required")
-      find("#team_name_field .help-block").should_not have_content("Additional help text")
+      expect(find("#team_manager_field .help-block")).to have_content("Required. Length up to 100. Additional help text for manager field.")
+      expect(find("#team_division_id_field .help-block")).to have_content("Required")
+      expect(find("#team_name_field .help-block")).not_to have_content("Additional help text")
     end
 
     it "should have option to override required status" do
@@ -585,9 +585,9 @@ describe "RailsAdmin Config DSL Edit Section" do
         end
       end
       visit new_path(:model_name => "team")
-      find("#team_manager_field .help-block").should have_content("Optional")
-      find("#team_division_id_field .help-block").should have_content("Optional")
-      find("#team_name_field .help-block").should have_content("Required")
+      expect(find("#team_manager_field .help-block")).to have_content("Optional")
+      expect(find("#team_division_id_field .help-block")).to have_content("Optional")
+      expect(find("#team_name_field .help-block")).to have_content("Required")
     end
   end
 
@@ -624,9 +624,9 @@ describe "RailsAdmin Config DSL Edit Section" do
       page.find('#field_test_nested_field_tests_attributes_1__destroy').set('true')
       click_button "Save"
       @record.reload
-      @record.comment.content.should == 'nested comment content'
-      @record.nested_field_tests.length.should == 1
-      @record.nested_field_tests[0].title.should == 'nested field test title 1 edited'
+      expect(@record.comment.content).to eq('nested comment content')
+      expect(@record.nested_field_tests.length).to eq(1)
+      expect(@record.nested_field_tests[0].title).to eq('nested field test title 1 edited')
     end
 
     it 'should set bindings[:object] to nested object' do
@@ -642,7 +642,7 @@ describe "RailsAdmin Config DSL Edit Section" do
       @record = FieldTest.create
       @record.nested_field_tests << NestedFieldTest.create!(:title => 'title 1')
       visit edit_path(:model_name => "field_test", :id => @record.id)
-      find('#field_test_nested_field_tests_attributes_0_title_field').should have_content('NestedFieldTest')
+      expect(find('#field_test_nested_field_tests_attributes_0_title_field')).to have_content('NestedFieldTest')
     end
 
     it 'should be desactivable' do
@@ -677,7 +677,7 @@ describe "RailsAdmin Config DSL Edit Section" do
         FieldTest.nested_attributes_options.stub(:[]).with(:nested_field_tests).
           and_return({:allow_destroy=>false, :update_only=>false})
         visit edit_path(:model_name => "field_test", :id => @record.id)
-        find('#field_test_nested_field_tests_attributes_0_title').value.should == 'nested title 1'
+        expect(find('#field_test_nested_field_tests_attributes_0_title').value).to eq('nested title 1')
         should_not have_selector('form .remove_nested_fields')
         should have_selector('[id$="_fields_blueprint"] .remove_nested_fields')
       end
@@ -701,8 +701,8 @@ describe "RailsAdmin Config DSL Edit Section" do
       page.find('#field_test_embeds_attributes_1__destroy').set('true')
       click_button "Save"
       @record.reload
-      @record.embeds.length.should == 1
-      @record.embeds[0].name.should == 'embed 1 edited'
+      expect(@record.embeds.length).to eq(1)
+      expect(@record.embeds[0].name).to eq('embed 1 edited')
     end
   end
 
@@ -712,26 +712,26 @@ describe "RailsAdmin Config DSL Edit Section" do
     it "should be required" do
       # draft.notes is nullable and has no validation
       field = RailsAdmin::config("Draft").edit.fields.find{|f| f.name == :notes}
-      field.properties[:nullable?].should be true
-      field.required?.should be false
+      expect(field.properties[:nullable?]).to be_true
+      expect(field.required?).to be_false
 
       # draft.date is nullable in the schema but has an AR
       # validates_presence_of validation that makes it required
       field = RailsAdmin::config("Draft").edit.fields.find{|f| f.name == :date}
-      field.properties[:nullable?].should be true
-      field.required?.should be true
+      expect(field.properties[:nullable?]).to be_true
+      expect(field.required?).to be_true
 
       # draft.round is nullable in the schema but has an AR
       # validates_numericality_of validation that makes it required
       field = RailsAdmin::config("Draft").edit.fields.find{|f| f.name == :round}
-      field.properties[:nullable?].should be true
-      field.required?.should be true
+      expect(field.properties[:nullable?]).to be_true
+      expect(field.required?).to be_true
 
       # team.revenue is nullable in the schema but has an AR
       # validates_numericality_of validation that allows nil
       field = RailsAdmin::config("Team").edit.fields.find{|f| f.name == :revenue}
-      field.properties[:nullable?].should be true
-      field.required?.should be false
+      expect(field.properties[:nullable?]).to be_true
+      expect(field.required?).to be_false
     end
   end
 
@@ -739,7 +739,7 @@ describe "RailsAdmin Config DSL Edit Section" do
 
     it "should start with CKEditor disabled" do
        field = RailsAdmin::config("Draft").edit.fields.find{|f| f.name == :notes}
-       field.ckeditor.should be false
+       expect(field.ckeditor).to be_false
     end
 
     it "should add Javascript to enable CKEditor" do
@@ -759,7 +759,7 @@ describe "RailsAdmin Config DSL Edit Section" do
 
     it "should start with CodeMirror disabled" do
        field = RailsAdmin::config("Draft").edit.fields.find{|f| f.name == :notes}
-       field.codemirror.should be false
+       expect(field.codemirror).to be_false
     end
 
     it "should add Javascript to enable CodeMirror" do
@@ -779,7 +779,7 @@ describe "RailsAdmin Config DSL Edit Section" do
 
     it "should start with bootstrap_wysihtml5 disabled" do
        field = RailsAdmin::config("Draft").edit.fields.find{|f| f.name == :notes}
-       field.bootstrap_wysihtml5.should be false
+       expect(field.bootstrap_wysihtml5).to be_false
     end
 
     it "should add Javascript to enable bootstrap_wysihtml5" do