rails_admin 0.6.0 → 0.6.1

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

@@ -1,25 +1,25 @@
 require 'spec_helper'
 
-describe "RailsAdmin Basic Bulk Action" do
+describe 'RailsAdmin Basic Bulk Action' do
 
   subject { page }
 
-  before(:each) do
-    @players = 2.times.map { FactoryGirl.create :player }
+  before do
+    @players = 2.times.collect { FactoryGirl.create :player }
   end
 
-  describe "bulk_delete" do
-    it "shows names of to-be-deleted players" do
-      post(bulk_action_path(:bulk_action => 'bulk_delete', :model_name => "player", :bulk_ids => @players.map(&:id)))
+  describe 'bulk_delete' do
+    it 'shows names of to-be-deleted players' do
+      post(bulk_action_path(bulk_action: 'bulk_delete', model_name: 'player', bulk_ids: @players.collect(&:id)))
       @players.each { |player| expect(response.body).to include(player.name) }
     end
   end
 
-  describe "bulk_export" 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") }
+  describe 'bulk_export' 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') }
     end
   end
 end

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

@@ -1,53 +1,53 @@
 require 'spec_helper'
 
-describe "RailsAdmin Basic Bulk Destroy" do
+describe 'RailsAdmin Basic Bulk Destroy' do
   subject { page }
 
-  describe "successful bulk delete of records", :active_record => true do
+  describe 'successful bulk delete of records', active_record: true do
     before do
       RailsAdmin::History.destroy_all
       RailsAdmin.config { |c| c.audit_with :history }
-      @players = 3.times.map { FactoryGirl.create(:player) }
-      @delete_ids = @players[0..1].map(&:id)
+      @players = 3.times.collect { FactoryGirl.create(:player) }
+      @delete_ids = @players[0..1].collect(&:id)
 
       # NOTE: This uses an internal, unsupported capybara API which could break at any moment. We
       # should refactor this test so that it either A) uses capybara's supported API (only GET
       # requests via visit) or B) just uses Rack::Test (and doesn't use capybara for browser
       # interaction like click_button).
       page.driver.browser.reset_host!
-      page.driver.browser.process :post, bulk_action_path(:bulk_action => 'bulk_delete', :model_name => "player", :bulk_ids => @delete_ids, '_method' => 'post')
+      page.driver.browser.process :post, bulk_action_path(:bulk_action => 'bulk_delete', :model_name => 'player', :bulk_ids => @delete_ids, '_method' => 'post')
       click_button "Yes, I'm sure"
     end
 
-    it "does not contain deleted records" do
-      expect(RailsAdmin::AbstractModel.new("Player").count).to eq(1)
+    it 'does not contain deleted records' do
+      expect(RailsAdmin::AbstractModel.new('Player').count).to eq(1)
       expect(RailsAdmin::History.count).to eq(@delete_ids.count)
       RailsAdmin::History.all.each do |history|
-        expect(history.table).to eq("Player")
+        expect(history.table).to eq('Player')
       end
       RailsAdmin::History.all.each do |history|
         expect(@delete_ids).to include(history.item)
       end
-      expect(page).to have_selector(".alert-success", :text => "2 Players successfully deleted")
+      expect(page).to have_selector('.alert-success', text: '2 Players successfully deleted')
     end
   end
 
-  describe "cancelled bulk_deletion" do
+  describe 'cancelled bulk_deletion' do
     before do
-      @players = 3.times.map { FactoryGirl.create(:player) }
-      @delete_ids = @players[0..1].map(&:id)
+      @players = 3.times.collect { FactoryGirl.create(:player) }
+      @delete_ids = @players[0..1].collect(&:id)
 
       # NOTE: This uses an internal, unsupported capybara API which could break at any moment. We
       # should refactor this test so that it either A) uses capybara's supported API (only GET
       # requests via visit) or B) just uses Rack::Test (and doesn't use capybara for browser
       # interaction like click_button).
       page.driver.browser.reset_host!
-      page.driver.browser.process :post, bulk_action_path(:bulk_action => 'bulk_delete', :model_name => "player", :bulk_ids => @delete_ids, '_method' => 'post')
-      click_button "Cancel"
+      page.driver.browser.process :post, bulk_action_path(:bulk_action => 'bulk_delete', :model_name => 'player', :bulk_ids => @delete_ids, '_method' => 'post')
+      click_button 'Cancel'
     end
 
-    it "does not delete records" do
-      expect(RailsAdmin::AbstractModel.new("Player").count).to eq(3)
+    it 'does not delete records' do
+      expect(RailsAdmin::AbstractModel.new('Player').count).to eq(3)
     end
   end
 end

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

@@ -1,86 +1,86 @@
 require 'spec_helper'
 
-describe "RailsAdmin Basic Create" do
+describe 'RailsAdmin Basic Create' do
   subject { page }
 
-  describe "create" do
-    before(:each) do
-      visit new_path(:model_name => "player")
-      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
-      @player = RailsAdmin::AbstractModel.new("Player").first
+  describe 'create' do
+    before do
+      visit new_path(model_name: 'player')
+      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
+      @player = RailsAdmin::AbstractModel.new('Player').first
     end
 
-    it "creates an object with correct attributes" do
-      expect(@player.name).to eq("Jackie Robinson")
+    it 'creates an object with correct attributes' do
+      expect(@player.name).to eq('Jackie Robinson')
       expect(@player.number).to eq(42)
-      expect(@player.position).to eq("Second baseman")
+      expect(@player.position).to eq('Second baseman')
     end
   end
 
-  describe "create and edit" do
-    before(:each) do
-      visit new_path(:model_name => "player")
+  describe 'create and edit' do
+    before do
+      visit new_path(model_name: 'player')
 
-      fill_in "player[name]", :with => "Jackie Robinson"
-      fill_in "player[number]", :with => "42"
-      fill_in "player[position]", :with => "Second baseman"
-      click_button "Save and edit"
+      fill_in 'player[name]', with: 'Jackie Robinson'
+      fill_in 'player[number]', with: '42'
+      fill_in 'player[position]', with: 'Second baseman'
+      click_button 'Save and edit'
 
-      @player = RailsAdmin::AbstractModel.new("Player").first
+      @player = RailsAdmin::AbstractModel.new('Player').first
     end
 
-    it "creates an object with correct attributes" do
-      expect(@player.name).to eq("Jackie Robinson")
+    it 'creates an object with correct attributes' do
+      expect(@player.name).to eq('Jackie Robinson')
       expect(@player.number).to eq(42)
-      expect(@player.position).to eq("Second baseman")
+      expect(@player.position).to eq('Second baseman')
     end
   end
 
-  describe "create and add another" do
-    before(:each) do
-      visit new_path(:model_name => "player")
+  describe 'create and add another' do
+    before do
+      visit new_path(model_name: 'player')
 
-      fill_in "player[name]", :with => "Jackie Robinson"
-      fill_in "player[number]", :with => "42"
-      fill_in "player[position]", :with => "Second baseman"
-      click_button "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 and add another'
 
-      @player = RailsAdmin::AbstractModel.new("Player").first
+      @player = RailsAdmin::AbstractModel.new('Player').first
     end
 
-    it "creates an object with correct attributes" do
-      expect(@player.name).to eq("Jackie Robinson")
+    it 'creates an object with correct attributes' do
+      expect(@player.name).to eq('Jackie Robinson')
       expect(@player.number).to eq(42)
-      expect(@player.position).to eq("Second baseman")
+      expect(@player.position).to eq('Second baseman')
     end
   end
 
-  describe "create with has-one association" do
-    before(:each) do
+  describe 'create with has-one association' do
+    before do
       @draft = FactoryGirl.create :draft
 
-      post new_path(:model_name => "player", :player => {:name => "Jackie Robinson", :number => 42, :position => 'Second baseman', :draft_id => @draft.id})
+      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.last # first is created by FactoryGirl
     end
 
-    it "creates an object with correct associations" do
+    it 'creates an object with correct associations' do
       @draft.reload
       expect(@player.draft).to eq(@draft)
     end
   end
 
-  describe "create with has-many association" do
-    before(:each) do
-      @divisions = 3.times.map { Division.create!(:name => "div #{Time.now.to_f}", :league => League.create!(:name => "league #{Time.now.to_f}")) }
-      post new_path(:model_name => "league", :league => {:name => "National League", :division_ids =>[@divisions[0].id]})
-      @league = RailsAdmin::AbstractModel.new("League").all.to_a.last
+  describe 'create with has-many association' do
+    before do
+      @divisions = 3.times.collect { Division.create!(name: "div #{Time.now.to_f}", league: League.create!(name: "league #{Time.now.to_f}")) }
+      post new_path(model_name: 'league', league: {name: 'National League', division_ids: [@divisions[0].id]})
+      @league = RailsAdmin::AbstractModel.new('League').all.to_a.last
     end
 
-    it "creates an object with correct associations" do
+    it 'creates an object with correct associations' do
       @divisions[0].reload
       expect(@league.divisions).to include(@divisions[0])
       expect(@league.divisions).not_to include(@divisions[1])
@@ -88,14 +88,14 @@ describe "RailsAdmin Basic Create" do
     end
   end
 
-  describe "create with has-and-belongs-to-many association" do
-    before(:each) do
-      @teams = 3.times.map { FactoryGirl.create :team }
-      post new_path(:model_name => "fan", :fan => {:name => "John Doe", :team_ids => [@teams[0].id] })
-      @fan = RailsAdmin::AbstractModel.new("Fan").first
+  describe 'create with has-and-belongs-to-many association' do
+    before do
+      @teams = 3.times.collect { FactoryGirl.create :team }
+      post new_path(model_name: 'fan', fan: {name: 'John Doe', team_ids: [@teams[0].id]})
+      @fan = RailsAdmin::AbstractModel.new('Fan').first
     end
 
-    it "creates an object with correct associations" do
+    it 'creates an object with correct associations' do
       @teams[0].reload
       expect(@fan.teams).to include(@teams[0])
       expect(@fan.teams).not_to include(@teams[1])
@@ -103,38 +103,38 @@ describe "RailsAdmin Basic Create" do
     end
   end
 
-  describe "create with uniqueness constraint violated", :given => "a player exists" do
-    before(:each) do
+  describe 'create with uniqueness constraint violated', given: 'a player exists' do
+    before do
       @team = FactoryGirl.create :team
-      @player = FactoryGirl.create :player, :team => @team
+      @player = FactoryGirl.create :player, team: @team
 
-      post new_path(:model_name => "player", :player => {:name => @player.name, :number => @player.number.to_s, :position => @player.position, :team_id => @team.id})
+      post new_path(model_name: 'player', player: {name: @player.name, number: @player.number.to_s, position: @player.position, team_id: @team.id})
     end
 
-    it "shows an error message" do
-      expect(response.body).to include("There is already a player with that number on this team")
+    it 'shows an error message' do
+      expect(response.body).to include('There is already a player with that number on this team')
     end
   end
 
-  describe "create with invalid object" do
-    before(:each) do
-      post new_path(:model_name => "player", :player => {:id => 1})
+  describe 'create with invalid object' do
+    before do
+      post new_path(model_name: 'player', player: {id: 1})
     end
 
-    it "shows an error message" do
-      expect(response.body).to include("Player failed to be created")
+    it 'shows an error message' do
+      expect(response.body).to include('Player failed to be created')
     end
   end
 
-  describe "create with object with errors on base" do
-    before(:each) do
-      visit new_path(:model_name => "player")
-      fill_in "player[name]", :with => "Jackie Robinson on steroids"
-      click_button "Save and add another"
+  describe 'create with object with errors on base' do
+    before do
+      visit new_path(model_name: 'player')
+      fill_in 'player[name]', with: 'Jackie Robinson on steroids'
+      click_button 'Save and add another'
     end
 
-    it "shows error base error message in flash" do
-      should have_content("Player failed to be created. Player is cheating")
+    it 'shows error base error message in flash' do
+      should 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,16 +1,16 @@
 require 'spec_helper'
 
-describe "RailsAdmin Namespaced Model Create" do
+describe 'RailsAdmin Namespaced Model Create' do
 
   subject { page }
 
-  it "creates object with correct attributes" do
-    visit new_path(:model_name => "cms~basic_page")
+  it 'creates object with correct attributes' do
+    visit new_path(model_name: 'cms~basic_page')
 
-    fill_in "cms_basic_page[title]", :with => "Hello"
-    fill_in "cms_basic_page[content]", :with => "World"
-    expect {
-      click_button "Save" # first(:button, "Save").click
-    }.to change(Cms::BasicPage, :count).by(1)
+    fill_in 'cms_basic_page[title]', with: 'Hello'
+    fill_in 'cms_basic_page[content]', with: 'World'
+    expect do
+      click_button 'Save' # first(:button, "Save").click
+    end.to change(Cms::BasicPage, :count).by(1)
   end
 end

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

@@ -1,34 +1,34 @@
 require 'spec_helper'
 
-describe "RailsAdmin Basic Delete" do
+describe 'RailsAdmin Basic Delete' do
 
   subject { page }
 
-  describe "delete" do
+  describe 'delete' do
     it "shows \"Delete model\"" do
       @draft = FactoryGirl.create :draft
       @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}")
+      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}")
     end
   end
 
-  describe "delete with missing object" do
-    before(:each) do
-      visit delete_path(:model_name => "player", :id => 1)
+  describe 'delete with missing object' do
+    before do
+      visit delete_path(model_name: 'player', id: 1)
     end
 
-    it "raises NotFound" do
+    it 'raises NotFound' do
       expect(page.driver.status_code).to eq(404)
     end
   end
 
-  describe "with show action disabled" do
-    before(:each) do
+  describe 'with show action disabled' do
+    before do
       RailsAdmin.config.actions do
         dashboard
         index
@@ -37,28 +37,28 @@ describe "RailsAdmin Basic Delete" do
       @draft = FactoryGirl.create :draft
       @player = @draft.player
       @comment = @player.comments.create
-      visit delete_path(:model_name => "player", :id => @player.id)
+      visit delete_path(model_name: 'player', id: @player.id)
     end
 
     it "shows \"Delete model\"" do
-      should have_content("delete this player")
+      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}\"]")
     end
   end
 
-  describe "delete of an object which has an associated item without id" do
-    before(:each) do
+  describe 'delete of an object which has an associated item without id' do
+    before do
       @player = FactoryGirl.create :player
       allow_any_instance_of(Player).to receive(:draft).and_return(Draft.new)
-      visit delete_path(:model_name => "player", :id => @player.id)
+      visit delete_path(model_name: 'player', id: @player.id)
     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}")
+      should_not have_content('Routing Error')
+      should have_content('delete this player')
+      should have_link(@player.name, href: "/admin/player/#{@player.id}")
     end
   end
 end

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

@@ -1,84 +1,84 @@
 require 'spec_helper'
 
-describe "RailsAdmin Basic Destroy" do
+describe 'RailsAdmin Basic Destroy' do
 
   subject { page }
 
-  describe "destroy" do
-    before(:each) do
+  describe 'destroy' do
+    before do
       @player = FactoryGirl.create :player
-      visit delete_path(:model_name => "player", :id => @player.id)
+      visit delete_path(model_name: 'player', id: @player.id)
       click_button "Yes, I'm sure"
-      @player = RailsAdmin::AbstractModel.new("Player").first
+      @player = RailsAdmin::AbstractModel.new('Player').first
     end
 
-    it "destroys an object" do
+    it 'destroys an object' do
       expect(@player).to be_nil
     end
 
-    it "shows success message" do
+    it 'shows success message' do
       should have_content('Player successfully deleted')
     end
   end
 
-  describe "handle destroy errors" do
-    before(:each) do
+  describe 'handle destroy errors' do
+    before do
       allow_any_instance_of(Player).to receive(:destroy_hook).and_return false
       @player = FactoryGirl.create :player
-      visit delete_path(:model_name => "player", :id => @player.id)
+      visit delete_path(model_name: 'player', id: @player.id)
       click_button "Yes, I'm sure"
     end
 
-    it "does not destroy an object" do
+    it 'does not destroy an object' do
       expect(@player.reload).to be
     end
 
-    it "shows error message" do
+    it 'shows error message' do
       should have_content('Player failed to be deleted')
     end
   end
 
-  describe "destroy" do
-    before(:each) do
+  describe 'destroy' do
+    before do
       @player = FactoryGirl.create :player
-      visit delete_path(:model_name => "player", :id => @player.id)
-      click_button "Cancel"
-      @player = RailsAdmin::AbstractModel.new("Player").first
+      visit delete_path(model_name: 'player', id: @player.id)
+      click_button 'Cancel'
+      @player = RailsAdmin::AbstractModel.new('Player').first
     end
 
-    it "does not destroy an object" do
+    it 'does not destroy an object' do
       expect(@player).to be
     end
   end
 
-  describe "destroy with missing object" do
-    before(:each) do
-      delete delete_path(:model_name => "player", :id => 1)
+  describe 'destroy with missing object' do
+    before do
+      delete delete_path(model_name: 'player', id: 1)
     end
 
-    it "raises NotFound" do
-      expect(response.code).to eq("404")
+    it 'raises NotFound' do
+      expect(response.code).to eq('404')
     end
   end
 
-  describe "destroy from show page" do
-    it "redirects to the index instead of trying to show the deleted object" do
+  describe 'destroy from show page' do
+    it 'redirects to the index instead of trying to show the deleted object' do
       @player = FactoryGirl.create :player
-      visit show_path(:model_name => 'player', :id => @player.id)
-      click_link "Delete"
+      visit show_path(model_name: 'player', id: @player.id)
+      click_link 'Delete'
       click_button "Yes, I'm sure"
 
-      expect(URI.parse(page.current_url).path).to eq(index_path(:model_name => 'player'))
+      expect(URI.parse(page.current_url).path).to eq(index_path(model_name: 'player'))
     end
 
-    it "redirects back to the object on error" do
+    it 'redirects back to the object on error' do
       allow_any_instance_of(Player).to receive(:destroy_hook).and_return false
       @player = FactoryGirl.create :player
-      visit show_path(:model_name => 'player', :id => @player.id)
-      click_link "Delete"
+      visit show_path(model_name: 'player', id: @player.id)
+      click_link 'Delete'
       click_button "Yes, I'm sure"
 
-      expect(URI.parse(page.current_url).path).to eq(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