rails_admin 0.1.1 → 0.1.2

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

@@ -45,8 +45,8 @@ describe "RailsAdmin Config DSL List Section" do
 
     it "should show all by default" do
       visit index_path(:model_name => "fan")
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Id", "Created at", "Updated at", "His Name", "Teams"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Id", "Created at", "Updated at", "His Name", "Teams"]
     end
 
     it "should hide some fields on demand with a block" do
@@ -58,8 +58,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Id", "His Name", "Teams"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Id", "His Name", "Teams"]
     end
 
     it "should hide some fields on demand with fields list" do
@@ -69,8 +69,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Id", "His Name", "Teams"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Id", "His Name", "Teams"]
     end
 
     it "should add some fields on demand with a block" do
@@ -82,8 +82,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Id", "His Name", "Teams"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Id", "His Name", "Teams"]
     end
 
     it "should show some fields on demand with fields list, respect ordering and configure them" do
@@ -97,9 +97,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Modified Id", "Modified His Name"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Modified Id", "Modified His Name"]
     end
 
     it "should show all fields if asked" do
@@ -111,9 +110,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Id", "Created at", "Updated at", "His Name", "Teams"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Id", "Created at", "Updated at", "His Name", "Teams"]
     end
 
     it "should appear in order defined" do
@@ -126,9 +124,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should == ["Updated at", "His Name", "Id", "Created at"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to eq(["Updated at", "His Name", "Id", "Created at"])
     end
 
     it "should only list the defined fields if some fields are defined" do
@@ -139,8 +136,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should == ["Id", "His Name"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to eq(["Id", "His Name"])
       should have_no_selector("th:nth-child(4).header")
     end
 
@@ -151,7 +148,7 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      find("th:nth-child(2)").should have_content("His Name")
+      expect(find("th:nth-child(2)")).to have_content("His Name")
     end
 
     it "should be renameable" do
@@ -164,8 +161,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      find("th:nth-child(2)").should have_content("Identifier")
-      find("th:nth-child(3)").should have_content("His Name")
+      expect(find("th:nth-child(2)")).to have_content("Identifier")
+      expect(find("th:nth-child(3)")).to have_content("His Name")
     end
 
     it "should be renameable by type" do
@@ -177,8 +174,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Id", "Created at (datetime)", "Updated at (datetime)", "His Name", "Teams"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Id", "Created at (datetime)", "Updated at (datetime)", "His Name", "Teams"]
     end
 
     it "should be globally renameable by type" do
@@ -190,8 +187,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Id", "Created at (datetime)", "Updated at (datetime)", "His Name", "Teams"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Id", "Created at (datetime)", "Updated at (datetime)", "His Name", "Teams"]
     end
 
     it "should be sortable by default" do
@@ -263,8 +260,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Id", "His Name", "Teams"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Id", "His Name", "Teams"]
     end
 
     it "should have option to hide fields by type globally" do
@@ -276,8 +273,8 @@ describe "RailsAdmin Config DSL List Section" do
         end
       end
       visit index_path(:model_name => "fan")
-      all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }.
-        should =~ ["Id", "His Name", "Teams"]
+      expect(all("th").map(&:text).delete_if{|t| /^\n*$/ =~ t }).
+        to match_array ["Id", "His Name", "Teams"]
     end
 
     it "should have option to customize column width" do
@@ -293,8 +290,8 @@ describe "RailsAdmin Config DSL List Section" do
       end
       @fans = 2.times.map { FactoryGirl.create :fan }
       visit index_path(:model_name => "fan")
-      find('style').should have_content("#list th.#{PK_COLUMN}_field")
-      find('style').should have_content("#list td.#{PK_COLUMN}_field")
+      expect(find('style')).to have_content("#list th.#{PK_COLUMN}_field")
+      expect(find('style')).to have_content("#list td.#{PK_COLUMN}_field")
     end
 
     it "should have option to customize output formatting" do
@@ -312,8 +309,8 @@ describe "RailsAdmin Config DSL List Section" do
       end
       @fans = 2.times.map { FactoryGirl.create :fan }
       visit index_path(:model_name => "fan")
-      find('tbody tr:nth-child(1) td:nth-child(3)').should have_content(@fans[1].name.upcase)
-      find('tbody tr:nth-child(2) td:nth-child(3)').should have_content(@fans[0].name.upcase)
+      expect(find('tbody tr:nth-child(1) td:nth-child(3)')).to have_content(@fans[1].name.upcase)
+      expect(find('tbody tr:nth-child(2) td:nth-child(3)')).to have_content(@fans[0].name.upcase)
     end
 
     it "should have a simple option to customize output formatting of date fields" do
@@ -359,7 +356,7 @@ describe "RailsAdmin Config DSL List Section" do
       @team = FactoryGirl.create :team
       @players = 2.times.map { FactoryGirl.create :player, :team => @team }
       visit index_path(:model_name => "team")
-      find('tbody tr:nth-child(1) td:nth-child(4)').should have_content(@players.collect(&:name).join(", "))
+      expect(find('tbody tr:nth-child(1) td:nth-child(4)')).to have_content(@players.collect(&:name).join(", "))
     end
   end
 
@@ -395,7 +392,7 @@ describe "RailsAdmin Config DSL List Section" do
         end
         visit index_path(:model_name => "player")
         player_names_by_date.reverse.each_with_index do |name, i|
-          find("tbody tr:nth-child(#{i + 1})").should have_content(name)
+          expect(find("tbody tr:nth-child(#{i + 1})")).to have_content(name)
         end
       end
     end
@@ -408,7 +405,7 @@ describe "RailsAdmin Config DSL List Section" do
       end
       visit index_path(:model_name => "player")
       player_names_by_date.reverse.each_with_index do |name, i|
-        find("tbody tr:nth-child(#{i + 1})").should have_content(name)
+        expect(find("tbody tr:nth-child(#{i + 1})")).to have_content(name)
       end
     end
 
@@ -421,7 +418,7 @@ describe "RailsAdmin Config DSL List Section" do
       end
       visit index_path(:model_name => "player")
       player_names_by_date.each_with_index do |name, i|
-        find("tbody tr:nth-child(#{i + 1})").should have_content(name)
+        expect(find("tbody tr:nth-child(#{i + 1})")).to have_content(name)
       end
     end
   end

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

@@ -23,11 +23,11 @@ describe "RailsAdmin Config DSL Show Section" do
     let(:body) { page.body }
 
     it 'should create a JSON uri' do
-      uri.should == "/admin/player/#{@player.id}.json"
+      expect(uri).to eq("/admin/player/#{@player.id}.json")
     end
 
     it 'should contain the JSONified object' do
-      body.should include(@player.to_json)
+      expect(body).to include(@player.to_json)
     end
   end
 

data/spec/integration/history/rails_admin_history_spec.rb

@@ -14,15 +14,15 @@ describe "RailsAdmin History", :active_record => true do
 
     it "should fetch one page of history" do
       histories = RailsAdmin::History.history_for_model @model, nil, false, false, false, nil, 20
-      histories.total_count.should == 30
-      histories.count.should == 20
+      expect(histories.total_count).to eq(30)
+      expect(histories.count).to eq(20)
     end
 
     it "should respect RailsAdmin::Config.default_items_per_page" do
       RailsAdmin.config.default_items_per_page = 15
       histories = RailsAdmin::History.history_for_model @model, nil, false, false, false, nil
-      histories.total_count.should == 30
-      histories.count.should == 15
+      expect(histories.total_count).to eq(30)
+      expect(histories.count).to eq(15)
     end
 
     context "with Kaminari" do
@@ -55,8 +55,8 @@ describe "RailsAdmin History", :active_record => true do
       # test that no link uses the "wildcard route" with the history
       # controller and for_model method
       it "should not use the 'wildcard route'" do
-        page.should have_selector("a[href*='all=true']") # make sure we're fully testing pagination
-        page.should have_no_selector("a[href^='/rails_admin/history/for_model']")
+        expect(page).to have_selector("a[href*='all=true']") # make sure we're fully testing pagination
+        expect(page).to have_no_selector("a[href^='/rails_admin/history/for_model']")
       end
 
       context "with a lot of histories" do
@@ -69,13 +69,13 @@ describe "RailsAdmin History", :active_record => true do
         end
 
         it 'should get latest ones' do
-          RailsAdmin::History.latest.count.should == 100
+          expect(RailsAdmin::History.latest.count).to eq(100)
         end
 
         it 'should get latest ones orderly' do
           latest = RailsAdmin::History.latest
-          latest.first.message.should == "change 100"
-          latest.last.message.should == "change 1"
+          expect(latest.first.message).to eq("change 100")
+          expect(latest.last.message).to eq("change 1")
         end
 
         it "should render a XHR request successfully" do

data/spec/integration/rails_admin_spec.rb

@@ -41,7 +41,7 @@ describe "RailsAdmin" do
   end
 
   describe 'hidden fields with default values' do
-    
+
     before (:each) do
       RailsAdmin.config Player do
         include_all_fields
@@ -54,17 +54,17 @@ describe "RailsAdmin" do
         end
       end
     end
-    
+
     it "should show 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']")
     end
-    
+
     it "should not show label" do
       should_not have_selector("label", :text => "Name")
     end
-    
+
     it "should not show help block" do
       should_not have_xpath("id('player_name')/../p[@class='help-block']")
     end

data/spec/integration/relation_spec.rb

@@ -17,19 +17,19 @@ describe 'table relations' do
 
   describe 'column with nullable fk and no model validations' do
     it 'should be optional' do
-      @fields.find{ |f| f.name == :league }.required?.should == false
+      expect(@fields.find{ |f| f.name == :league }.required?).to be_false
     end
   end
 
   describe 'column with non-nullable fk and no model validations' do
     it 'should not be required' do
-      @fields.find{ |f| f.name == :division }.required?.should == false
+      expect(@fields.find{ |f| f.name == :division }.required?).to be_false
     end
   end
 
   describe 'column with nullable fk and a numericality model validation' do
     it 'should be required' do
-      @fields.find{ |f| f.name == :player }.required?.should == true
+      expect(@fields.find{ |f| f.name == :player }.required?).to be_true
     end
   end
 end

data/spec/spec_helper.rb

@@ -46,7 +46,9 @@ Devise.setup do |config|
 end
 
 RSpec.configure do |config|
-  require 'rspec/expectations'
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 
   config.include RSpec::Matchers
   config.include RailsAdmin::Engine.routes.url_helpers

data/spec/unit/abstract_model_spec.rb

@@ -14,11 +14,11 @@ describe RailsAdmin::AbstractModel do
         FactoryGirl.create(:field_test, :date_field => Date.strptime("01/02/2012", date_format))
         FactoryGirl.create(:field_test, :date_field => Date.strptime("01/03/2012", date_format))
         FactoryGirl.create(:field_test, :date_field => Date.strptime("01/04/2012", date_format))
-        @abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["", "01/02/2012", "01/03/2012"], :o => 'between' } } } ).count.should == 2
-        @abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["", "01/02/2012", "01/02/2012"], :o => 'between' } } } ).count.should == 1
-        @abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["", "01/03/2012", ""], :o => 'between' } } } ).count.should == 2
-        @abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["", "", "01/02/2012"], :o => 'between' } } } ).count.should == 2
-        @abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["01/02/2012"], :o => 'default' } } } ).count.should == 1
+        expect(@abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["", "01/02/2012", "01/03/2012"], :o => 'between' } } } ).count).to eq(2)
+        expect(@abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["", "01/02/2012", "01/02/2012"], :o => 'between' } } } ).count).to eq(1)
+        expect(@abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["", "01/03/2012", ""], :o => 'between' } } } ).count).to eq(2)
+        expect(@abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["", "", "01/02/2012"], :o => 'between' } } } ).count).to eq(2)
+        expect(@abstract_model.all(:filters => { "date_field" => { "1" => { :v => ["01/02/2012"], :o => 'default' } } } ).count).to eq(1)
 
       end
     end
@@ -34,11 +34,11 @@ describe RailsAdmin::AbstractModel do
         else
           FactoryGirl.create(:field_test, :datetime_field => Time.local(2012, 1, 4, 0, 0, 0))
         end
-        @abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["", "01/02/2012", "01/03/2012"], :o => 'between' } } } ).count.should == 2
-        @abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["", "01/02/2012", "01/02/2012"], :o => 'between' } } } ).count.should == 1
-        @abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["", "01/03/2012", ""], :o => 'between' } } } ).count.should == 2
-        @abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["", "", "01/02/2012"], :o => 'between' } } } ).count.should == 2
-        @abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["01/02/2012"], :o => 'default' } } } ).count.should == 1
+        expect(@abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["", "01/02/2012", "01/03/2012"], :o => 'between' } } } ).count).to eq(2)
+        expect(@abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["", "01/02/2012", "01/02/2012"], :o => 'between' } } } ).count).to eq(1)
+        expect(@abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["", "01/03/2012", ""], :o => 'between' } } } ).count).to eq(2)
+        expect(@abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["", "", "01/02/2012"], :o => 'between' } } } ).count).to eq(2)
+        expect(@abstract_model.all(:filters => { "datetime_field" => { "1" => { :v => ["01/02/2012"], :o => 'default' } } } ).count).to eq(1)
       end
     end
   end

data/spec/unit/active_record_extension_spec.rb

@@ -10,7 +10,7 @@ describe 'ActiveRecord::Base', :active_record => true do
       @player.should_receive(:read_attribute).exactly(1).times do |*args|
         original_method.call(*args)
       end
-      @player.safe_send(:number).should == 23
+      expect(@player.safe_send(:number)).to eq(23)
     end
   end
 end

data/spec/unit/adapters/active_record/abstract_object_spec.rb

@@ -25,15 +25,15 @@ describe "AbstractObject", :active_record => true do
       end
 
       it "should create a Player with given attributes" do
-        object.save.should be_true
+        expect(object.save).to be_true
 
         player.reload
-        player.name.should == name
-        player.number.should == number
-        player.position.should == position
-        player.suspended.should == false # protected
-        player.draft.should == nil
-        player.team.should == nil
+        expect(player.name).to eq(name)
+        expect(player.number).to eq(number)
+        expect(player.position).to eq(position)
+        expect(player.suspended).to be_false
+        expect(player.draft).to be_nil
+        expect(player.team).to be_nil
       end
     end
 
@@ -46,15 +46,15 @@ describe "AbstractObject", :active_record => true do
       end
 
       it "should create a Player with given attributes" do
-        object.save.should be_true
+        expect(object.save).to be_true
 
         player.reload
-        player.name.should == name
-        player.number.should == number
-        player.position.should == position
-        player.suspended.should == false # protected
-        player.draft.should == draft.reload
-        player.team.should == nil
+        expect(player.name).to eq(name)
+        expect(player.number).to eq(number)
+        expect(player.position).to eq(position)
+        expect(player.suspended).to be_false
+        expect(player.draft).to eq(draft.reload)
+        expect(player.team).to be_nil
       end
     end
 
@@ -70,10 +70,10 @@ describe "AbstractObject", :active_record => true do
       end
 
       it "should create a League with given attributes and associations" do
-        object.save.should be_true
+        expect(object.save).to be_true
         league.reload
-        league.name.should == name
-        league.divisions.should == divisions
+        expect(league.name).to eq(name)
+        expect(league.divisions).to eq(divisions)
       end
     end
   end
@@ -96,11 +96,11 @@ describe "AbstractObject", :active_record => true do
 
       it "should update a record and associations" do
         object.reload
-        object.number.should == new_number
-        object.name.should == name
-        object.draft.should == nil
-        object.suspended.should == true # protected
-        object.team.should == new_team
+        expect(object.number).to eq(new_number)
+        expect(object.name).to eq(name)
+        expect(object.draft).to be_nil
+        expect(object.suspended).to be_true
+        expect(object.team).to eq(new_team)
       end
     end
   end
@@ -114,7 +114,7 @@ describe "AbstractObject", :active_record => true do
     end
 
     it "should delete the record" do
-      Player.exists?(player.id).should == false
+      expect(Player.exists?(player.id)).to be_false
     end
   end
 
@@ -126,7 +126,7 @@ describe "AbstractObject", :active_record => true do
 
       @league = FactoryGirl.create :league
 
-      RailsAdmin.config('League').with(:object => @league).object_label.should == "League '#{@league.name}'"
+      expect(RailsAdmin.config('League').with(:object => @league).object_label).to eq("League '#{@league.name}'")
     end
   end
 end