rails_admin 0.6.0 → 0.6.1

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

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
-describe "RailsAdmin Basic New" do
+describe 'RailsAdmin Basic New' do
 
   subject { page }
 
-  describe "GET /admin/player/new" do
-    before(:each) do
-      visit new_path(:model_name => "player")
+  describe 'GET /admin/player/new' do
+    before do
+      visit new_path(model_name: 'player')
     end
 
     it "shows \"New Model\"" do
-      should have_content("New Player")
+      should have_content('New Player')
     end
 
     it "shows required fields as \"Required\"" do
-      should have_selector("div", :text => /Name\s*Required/)
-      should have_selector("div", :text => /Number\s*Required/)
+      should have_selector('div', text: /Name\s*Required/)
+      should have_selector('div', text: /Number\s*Required/)
     end
 
     it "shows non-required fields as \"Optional\"" do
-      should have_selector("#player_position_field .help-block", :text => "Optional")
-      should have_selector("#player_born_on_field .help-block", :text => "Optional")
-      should have_selector("#player_notes_field .help-block", :text => "Optional")
+      should have_selector('#player_position_field .help-block', text: 'Optional')
+      should have_selector('#player_born_on_field .help-block', text: 'Optional')
+      should have_selector('#player_notes_field .help-block', text: 'Optional')
     end
 
     # https://github.com/sferik/rails_admin/issues/362
@@ -32,41 +32,41 @@ describe "RailsAdmin Basic New" do
     end
   end
 
-  describe "GET /admin/player/new with has-one/belongs_to/has_many association" do
-    before(:each) do
+  describe 'GET /admin/player/new with has-one/belongs_to/has_many association' do
+    before do
       FactoryGirl.create :draft
-      visit new_path(:model_name => "player")
+      visit new_path(model_name: 'player')
     end
 
-    it "shows selects" do
-      should have_selector("select#player_draft_id")
-      should have_selector("select#player_team_id")
-      should have_selector("select#player_comment_ids")
+    it 'shows selects' do
+      should have_selector('select#player_draft_id')
+      should have_selector('select#player_team_id')
+      should have_selector('select#player_comment_ids')
     end
   end
 
-  describe "GET /admin/player/new with missing label" do
-    before(:each) do
-      FactoryGirl.create :team, :name => ""
-      visit new_path(:model_name => "player")
+  describe 'GET /admin/player/new with missing label' do
+    before do
+      FactoryGirl.create :team, name: ''
+      visit new_path(model_name: 'player')
     end
   end
 
-  describe "GET /admin/player/new with parameters for pre-population" do
-    it "populates form field when corresponding parameters are passed in" do
-      visit new_path(:model_name => 'player', :player => {:name => 'Sam'})
+  describe 'GET /admin/player/new with parameters for pre-population' do
+    it 'populates form field when corresponding parameters are passed in' do
+      visit new_path(model_name: 'player', player: {name: 'Sam'})
       expect(page).to have_css('input[value=Sam]')
     end
 
-    it "prepropulates belongs to relationships" do
-      @team = FactoryGirl.create :team, :name => "belongs_to association prepopulated"
-      visit new_path(:model_name => 'player', :associations => { :team => @team.id } )
+    it 'prepropulates belongs to relationships' do
+      @team = FactoryGirl.create :team, name: 'belongs_to association prepopulated'
+      visit new_path(model_name: 'player', associations: {team: @team.id})
       expect(page).to have_css("select#player_team_id option[selected='selected'][value='#{@team.id}']")
     end
 
-    it "prepropulates has_many relationships" do
-      @player = FactoryGirl.create :player, :name => "has_many association prepopulated"
-      visit new_path(:model_name => 'team', :associations => { :players => @player.id } )
+    it 'prepropulates has_many relationships' do
+      @player = FactoryGirl.create :player, name: 'has_many association prepopulated'
+      visit new_path(model_name: 'team', associations: {players: @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

@@ -1,30 +1,30 @@
 require 'spec_helper'
 
-describe "RailsAdmin Namespaced Model New" do
+describe 'RailsAdmin Namespaced Model New' do
 
   subject { page }
 
-  describe "AbstractModel#to_param" do
-    it "turns namespaces into prefixes with ~" do
-      expect(RailsAdmin::AbstractModel.new("Cms::BasicPage").to_param).to eq('cms~basic_page')
+  describe 'AbstractModel#to_param' do
+    it 'turns namespaces into prefixes with ~' do
+      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
+  describe 'ApplicationController#to_model_name' do
+    it 'turns cms~basic_page into Cms::BasicPage' do
       expect(RailsAdmin::ApplicationController.new.to_model_name('cms~basic_page')).to eq('Cms::BasicPage')
     end
   end
 
-  describe "GET /admin/cms_basic_page/new" do
-    before(:each) do
-      visit new_path(:model_name => "cms~basic_page")
+  describe 'GET /admin/cms_basic_page/new' do
+    before do
+      visit new_path(model_name: 'cms~basic_page')
     end
 
-    it "has correct input field names" do
-      should have_selector("label[for=cms_basic_page_title]")
+    it 'has correct input field names' do
+      should have_selector('label[for=cms_basic_page_title]')
       should have_selector("input#cms_basic_page_title[name='cms_basic_page[title]']")
-      should have_selector("label[for=cms_basic_page_content]")
+      should have_selector('label[for=cms_basic_page_content]')
       should have_selector("textarea#cms_basic_page_content[name='cms_basic_page[content]']")
     end
   end

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

@@ -1,81 +1,81 @@
 require 'spec_helper'
 
-describe "RailsAdmin Basic Show" do
+describe 'RailsAdmin Basic Show' do
   subject { page }
 
-  describe "show" do
-    it "has History, Edit, Delete, Details and attributes" do
+  describe 'show' do
+    it 'has History, Edit, Delete, Details and attributes' do
       @player = FactoryGirl.create :player
-      visit show_path(:model_name => "player", :id => @player.id)
+      visit show_path(model_name: 'player', id: @player.id)
 
-      should have_selector("a", :text => "History")
-      should have_selector("a", :text => "Edit")
-      should have_selector("a", :text => "Delete")
-      should have_content("Details")
-      should have_content("Name")
+      should have_selector('a', text: 'History')
+      should have_selector('a', text: 'Edit')
+      should have_selector('a', text: 'Delete')
+      should have_content('Details')
+      should have_content('Name')
       should have_content(@player.name)
-      should have_content("Number")
+      should have_content('Number')
       should have_content(@player.number)
     end
   end
 
-  describe "GET /admin/players/123this-id-doesnt-exist" do
-    it "raises NotFound" do
+  describe 'GET /admin/players/123this-id-doesnt-exist' do
+    it 'raises NotFound' do
       visit '/admin/players/123this-id-doesnt-exist'
       expect(page.driver.status_code).to eq(404)
     end
   end
 
-  describe "show with belongs_to association" do
-    before(:each) do
+  describe 'show with belongs_to association' do
+    before do
       @player = FactoryGirl.create :player
       @team   = FactoryGirl.create :team
-      @player.update_attributes(:team_id => @team.id)
-      visit show_path(:model_name => "player", :id => @player.id)
+      @player.update_attributes(team_id: @team.id)
+      visit show_path(model_name: 'player', id: @player.id)
     end
 
-    it "shows associated objects" do
+    it 'shows associated objects' do
       should have_css("a[href='/admin/team/#{@team.id}']")
     end
   end
 
-  describe "show with has-one association" do
-    before(:each) do
+  describe 'show with has-one association' do
+    before do
       @player = FactoryGirl.create :player
-      @draft  = FactoryGirl.create :draft, :player => @player
-      visit show_path(:model_name => "player", :id => @player.id)
+      @draft  = FactoryGirl.create :draft, player: @player
+      visit show_path(model_name: 'player', id: @player.id)
     end
 
-    it "shows associated objects" do
+    it 'shows associated objects' do
       should have_css("a[href='/admin/draft/#{@draft.id}']")
     end
   end
 
-  describe "show with has-and-belongs-to-many association" do
-    before(:each) do
+  describe 'show with has-and-belongs-to-many association' do
+    before do
       @player = FactoryGirl.create :player
-      @comment1 = FactoryGirl.create :comment, :commentable => @player
-      @comment2 = FactoryGirl.create :comment, :commentable => @player
-      @comment3 = FactoryGirl.create :comment, :commentable => FactoryGirl.create(:player)
+      @comment1 = FactoryGirl.create :comment, commentable: @player
+      @comment2 = FactoryGirl.create :comment, commentable: @player
+      @comment3 = FactoryGirl.create :comment, commentable: FactoryGirl.create(:player)
 
-      visit show_path(:model_name => "player", :id => @player.id)
+      visit show_path(model_name: 'player', id: @player.id)
     end
 
-    it "shows associated objects" do
+    it 'shows associated objects' do
       should have_css("a[href='/admin/comment/#{@comment1.id}']")
       should have_css("a[href='/admin/comment/#{@comment2.id}']")
       should_not have_css("a[href='/admin/comment/#{@comment3.id}']")
     end
   end
 
-  describe "show for polymorphic objects" do
-    before(:each) do
+  describe 'show for polymorphic objects' do
+    before do
       @player = FactoryGirl.create :player
-      @comment = FactoryGirl.create :comment, :commentable => @player
-      visit show_path(:model_name => "comment", :id => @comment.id)
+      @comment = FactoryGirl.create :comment, commentable: @player
+      visit show_path(model_name: 'comment', id: @comment.id)
     end
 
-    it "shows associated object" do
+    it 'shows associated object' do
       should have_css("a[href='/admin/player/#{@player.id}']")
     end
   end

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

@@ -1,148 +1,148 @@
 require 'spec_helper'
 
-describe "RailsAdmin Basic Update" do
+describe 'RailsAdmin Basic Update' do
 
   subject { page }
 
-  describe "update with errors" do
-    before(:each) do
+  describe 'update with errors' do
+    before do
       @player = FactoryGirl.create :player
-      visit edit_path(:model_name => "player", :id => @player.id)
+      visit edit_path(model_name: 'player', id: @player.id)
     end
 
-    it "returns to edit page" do
-      fill_in "player[name]", :with => ""
-      click_button "Save" # first(:button, "Save").click
+    it 'returns to edit page' do
+      fill_in 'player[name]', with: ''
+      click_button 'Save' # first(:button, "Save").click
       expect(page.driver.status_code).to eq(406)
-      should have_selector "form[action='#{edit_path(:model_name => "player", :id => @player.id)}']"
+      should have_selector "form[action='#{edit_path(model_name: "player", id: @player.id)}']"
     end
   end
 
-  describe "update and add another" do
-    before(:each) do
+  describe 'update and add another' do
+    before do
       @player = FactoryGirl.create :player
 
-      visit edit_path(:model_name => "player", :id => @player.id)
+      visit edit_path(model_name: 'player', id: @player.id)
 
-      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
+      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
+      @player = RailsAdmin::AbstractModel.new('Player').first
     end
 
-    it "updates an object with correct attributes" do
-      expect(@player.name).to eq("Jackie Robinson")
+    it 'updates 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 "update and edit" do
-    before(:each) do
+  describe 'update and edit' do
+    before do
       @player = FactoryGirl.create :player
 
-      visit edit_path(:model_name => "player", :id => @player.id)
+      visit edit_path(model_name: 'player', id: @player.id)
 
-      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.reload
     end
 
-    it "updates an object with correct attributes" do
-      expect(@player.name).to eq("Jackie Robinson")
+    it 'updates 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 "update with has-one association" do
-    before(:each) do
+  describe 'update with has-one association' do
+    before do
       @player = FactoryGirl.create :player
       @draft = FactoryGirl.create :draft
       @number = @draft.player.number + 1 # to avoid collision
-      put edit_path(:model_name => "player", :id => @player.id, :player => {:name => "Jackie Robinson", :draft_id => @draft.id, :number => @number, :position => "Second baseman"})
+      put edit_path(model_name: 'player', id: @player.id, player: {name: 'Jackie Robinson', draft_id: @draft.id, number: @number, position: 'Second baseman'})
       @player.reload
     end
 
-    it "updates an object with correct attributes" do
-      expect(@player.name).to eq("Jackie Robinson")
+    it 'updates an object with correct attributes' do
+      expect(@player.name).to eq('Jackie Robinson')
       expect(@player.number).to eq(@number)
-      expect(@player.position).to eq("Second baseman")
+      expect(@player.position).to eq('Second baseman')
     end
 
-    it "updates an object with correct associations" do
+    it 'updates an object with correct associations' do
       @draft.reload
       expect(@player.draft).to eq(@draft)
     end
   end
 
-  describe "update with has-many association" do
-    it "is fillable and emptyable", :active_record => true do
+  describe 'update with has-many association' do
+    it 'is fillable and emptyable', active_record: true do
       RailsAdmin.config do |c|
         c.audit_with :history
       end
 
       @league = FactoryGirl.create :league
-      @divisions = 3.times.map { Division.create!(:name => "div #{Time.now.to_f}", :league => League.create!(:name => "league #{Time.now.to_f}")) }
+      @divisions = 3.times.collect { Division.create!(name: "div #{Time.now.to_f}", league: League.create!(name: "league #{Time.now.to_f}")) }
 
-      put edit_path(:model_name => "league", :id => @league.id, :league => {:name => "National League", :division_ids => [@divisions[0].id] })
+      put edit_path(model_name: 'league', id: @league.id, league: {name: 'National League', division_ids: [@divisions[0].id]})
 
       old_name = @league.name
       @league.reload
-      expect(@league.name).to eq("National League")
+      expect(@league.name).to eq('National League')
       @divisions[0].reload
       expect(@league.divisions).to include(@divisions[0])
       expect(@league.divisions).not_to include(@divisions[1])
       expect(@league.divisions).not_to include(@divisions[2])
 
-      expect(RailsAdmin::History.where(:item => @league.id).collect(&:message)).to include("name: \"#{old_name}\" -> \"National League\"")
+      expect(RailsAdmin::History.where(item: @league.id).collect(&:message)).to include("name: \"#{old_name}\" -> \"National League\"")
 
-      put edit_path(:model_name => "league", :id => @league.id, :league => {:division_ids => [""]})
+      put edit_path(model_name: 'league', id: @league.id, league: {division_ids: ['']})
 
       @league.reload
       expect(@league.divisions).to be_empty
     end
   end
 
-  describe "update with missing object" do
-    before(:each) do
-      put edit_path(:model_name => "player", :id => 1), :params => {:player => {:name => "Jackie Robinson", :number => 42, :position => "Second baseman"}}
+  describe 'update with missing object' do
+    before do
+      put edit_path(model_name: 'player', id: 1), params: {player: {name: 'Jackie Robinson', number: 42, position: 'Second baseman'}}
     end
 
-    it "raises NotFound" do
-      expect(response.code).to eq("404")
+    it 'raises NotFound' do
+      expect(response.code).to eq('404')
     end
   end
 
-  describe "update with invalid object" do
-    before(:each) do
+  describe 'update with invalid object' do
+    before do
       @player = FactoryGirl.create :player
 
-      visit edit_path(:model_name => "player", :id => @player.id)
+      visit edit_path(model_name: 'player', id: @player.id)
 
-      fill_in "player[name]", :with => "Jackie Robinson"
-      fill_in "player[number]", :with => "a"
-      fill_in "player[position]", :with => "Second baseman"
-      click_button "Save" # first(:button, "Save").click
+      fill_in 'player[name]', with: 'Jackie Robinson'
+      fill_in 'player[number]', with: 'a'
+      fill_in 'player[position]', with: 'Second baseman'
+      click_button 'Save' # first(:button, "Save").click
 
       @player.reload
     end
 
-    it "shows an error message" do
+    it 'shows an error message' 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.
-      expect(Capybara.string(body)).to have_content("Player failed to be updated") unless CI_ORM == :mongoid && Mongoid::VERSION >= '3.0.0'
+      expect(Capybara.string(body)).to have_content('Player failed to be updated') unless CI_ORM == :mongoid && Mongoid::VERSION >= '3.0.0'
     end
   end
 
-  describe "update with serialized objects" do
-    before(:each) do
+  describe 'update with serialized objects' do
+    before do
       RailsAdmin.config do |c|
         c.model User do
           configure :roles, :serialized
@@ -151,40 +151,40 @@ describe "RailsAdmin Basic Update" do
 
       @user = FactoryGirl.create :user
 
-      visit edit_path(:model_name => "user", :id => @user.id)
+      visit edit_path(model_name: 'user', id: @user.id)
 
-      fill_in "user[roles]", :with => %{['admin', 'user']}
-      click_button "Save" # first(:button, "Save").click
+      fill_in 'user[roles]', with: %{['admin', 'user']}
+      click_button 'Save' # first(:button, "Save").click
 
       @user.reload
     end
 
-    it "saves the serialized data" do
-      expect(@user.roles).to eq(['admin','user'])
+    it 'saves the serialized data' do
+      expect(@user.roles).to eq(%w(admin user))
     end
   end
 
-  describe "update with serialized objects of Mongoid", :mongoid => true do
-    before(:each) do
+  describe 'update with serialized objects of Mongoid', mongoid: true do
+    before do
       @field_test = FactoryGirl.create :field_test
 
-      visit edit_path(:model_name => "field_test", :id => @field_test.id)
+      visit edit_path(model_name: 'field_test', id: @field_test.id)
     end
 
-    it "saves the serialized data" do
-      fill_in "field_test[array_field]", :with => "[4, 2]"
-      fill_in "field_test[hash_field]", :with => "{ a: 6, b: 2 }"
-      click_button "Save" # first(:button, "Save").click
+    it 'saves the serialized data' do
+      fill_in 'field_test[array_field]', with: '[4, 2]'
+      fill_in 'field_test[hash_field]', with: '{ a: 6, b: 2 }'
+      click_button 'Save' # first(:button, "Save").click
 
       @field_test.reload
       expect(@field_test.array_field).to eq([4, 2])
-      expect(@field_test.hash_field).to eq({ "a" => 6, "b" => 2 })
+      expect(@field_test.hash_field).to eq('a' => 6, 'b' => 2)
     end
 
-    it "clears data when empty string is passed" do
-      fill_in "field_test[array_field]", :with => ""
-      fill_in "field_test[hash_field]", :with => ""
-      click_button "Save" # first(:button, "Save").click
+    it 'clears data when empty string is passed' do
+      fill_in 'field_test[array_field]', with: ''
+      fill_in 'field_test[hash_field]', with: ''
+      click_button 'Save' # first(:button, "Save").click
 
       @field_test.reload
       expect(@field_test.array_field).to eq(nil)
@@ -192,37 +192,37 @@ describe "RailsAdmin Basic Update" do
     end
   end
 
-  describe "update with overridden to_param" do
-    before(:each) do
+  describe 'update with overridden to_param' do
+    before do
       @ball = FactoryGirl.create :ball
 
-      visit edit_path(:model_name => "ball", :id => @ball.id)
+      visit edit_path(model_name: 'ball', id: @ball.id)
 
-      fill_in "ball[color]", :with => "gray"
-      click_button "Save and edit"
+      fill_in 'ball[color]', with: 'gray'
+      click_button 'Save and edit'
 
       @ball.reload
     end
 
-    it "updates an object with correct attributes" do
-      expect(@ball.color).to eq("gray")
+    it 'updates an object with correct attributes' do
+      expect(@ball.color).to eq('gray')
     end
   end
 
-  describe "update of STI subclass on superclass view" do
-    before(:each) do
+  describe 'update of STI subclass on superclass view' do
+    before do
       @hardball = FactoryGirl.create :hardball
 
-      visit edit_path(:model_name => "ball", :id => @hardball.id)
+      visit edit_path(model_name: 'ball', id: @hardball.id)
 
-      fill_in "ball[color]", :with => "cyan"
-      click_button "Save and edit"
+      fill_in 'ball[color]', with: 'cyan'
+      click_button 'Save and edit'
 
       @hardball.reload
     end
 
-    it "updates an object with correct attributes" do
-      expect(@hardball.color).to eq("cyan")
+    it 'updates an object with correct attributes' do
+      expect(@hardball.color).to eq('cyan')
     end
   end