rails_admin 0.6.0 → 0.6.1

data/spec/integration/rails_admin_spec.rb

@@ -4,47 +4,45 @@ describe RailsAdmin do
 
   subject { page }
 
-  describe "authentication" do
-    it "is disableable" do
-      logout
-      RailsAdmin.config do |config|
-        config.included_models = []
-        config.authenticate_with {}
-      end
-      visit dashboard_path
-    end
+  before do
+    RailsAdmin::Config.authenticate_with { warden.authenticate! scope: :user }
+    RailsAdmin::Config.current_user_method(&:current_user)
+    login_as User.create(
+      email: 'username@example.com',
+      password: 'password'
+    )
   end
 
   # A common mistake for translators is to forget to change the YAML file's
   # root key from en to their own locale (as people tend to use the English
   # file as template for a new translation).
-  describe "localization" do
-    it "defaults to English" do
+  describe 'localization' do
+    it 'defaults to English' do
       RailsAdmin.config.included_models = []
       visit dashboard_path
 
-      should have_content("Site Administration")
-      should have_content("Dashboard")
+      should have_content('Site Administration')
+      should have_content('Dashboard')
     end
   end
 
-  describe "html head" do
+  describe 'html head' do
     before { visit dashboard_path }
 
     # Note: the [href^="/asset... syntax matches the start of a value. The reason
     # we just do that is to avoid being confused by rails' asset_ids.
-    it "loads stylesheets in header" do
-      should have_selector('head link[href^="/assets/rails_admin/rails_admin.css"]', :visible => false)
+    it 'loads stylesheets in header' do
+      should have_selector('head link[href^="/assets/rails_admin/rails_admin.css"]', visible: false)
     end
 
-    it "loads javascript files in body" do
-      should have_selector('head script[src^="/assets/rails_admin/rails_admin.js"]', :visible => false)
+    it 'loads javascript files in body' do
+      should have_selector('head script[src^="/assets/rails_admin/rails_admin.js"]', visible: false)
     end
   end
 
-  describe "hidden fields with default values" do
+  describe 'hidden fields with default values' do
 
-    before (:each) do
+    before do
       RailsAdmin.config Player do
         include_all_fields
         edit do
@@ -57,24 +55,25 @@ describe RailsAdmin do
       end
     end
 
-    it "shows up with default value, hidden" do
-      visit new_path(:model_name => "player")
+    it 'shows up with default value, hidden' do
+      visit new_path(model_name: 'player')
       should have_selector("#player_name[type=hidden][value='username@example.com']")
       should_not have_selector("#player_name[type=hidden][value='toto@example.com']")
     end
 
-    it "does not show label" do
-      should_not have_selector("label", :text => "Name")
+    it 'does not show label' do
+      should_not have_selector('label', text: 'Name')
     end
 
-    it "does not show help block" do
+    it 'does not show help block' do
       should_not have_xpath("id('player_name')/../p[@class='help-block']")
     end
   end
 
-  describe "_current_user" do # https://github.com/sferik/rails_admin/issues/549
+  describe '_current_user' do # https://github.com/sferik/rails_admin/issues/549
+
+    it 'is accessible from the list view' do
 
-    it "is accessible from the list view" do
       RailsAdmin.config Player do
         list do
           field :name do
@@ -91,61 +90,61 @@ describe RailsAdmin do
         end
       end
 
-      visit index_path(:model_name => "player")
-      should have_selector(".header.name_field")
-      should_not have_selector(".header.team_field")
+      visit index_path(model_name: 'player')
+      should have_selector('.header.name_field')
+      should_not have_selector('.header.team_field')
     end
   end
 
-  describe "polymorphic associations" do
+  describe 'polymorphic associations' do
     before :each do
       @team = FactoryGirl.create :team
-      @comment = FactoryGirl.create :comment, :commentable => @team
+      @comment = FactoryGirl.create :comment, commentable: @team
     end
 
-    it "works like belongs to associations in the list view" do
-      visit index_path(:model_name => "comment")
+    it 'works like belongs to associations in the list view' do
+      visit index_path(model_name: 'comment')
 
       should have_content(@team.name)
     end
 
-    it "is editable" do
-      visit edit_path(:model_name => "comment", :id => @comment.id)
+    it 'is editable' do
+      visit edit_path(model_name: 'comment', id: @comment.id)
 
-      should have_selector("select#comment_commentable_type")
-      should have_selector("select#comment_commentable_id")
+      should have_selector('select#comment_commentable_type')
+      should have_selector('select#comment_commentable_id')
     end
 
-    it "is visible in the owning end" do
-      visit edit_path(:model_name => "team", :id => @team.id)
+    it 'is visible in the owning end' do
+      visit edit_path(model_name: 'team', id: @team.id)
 
-      should have_selector("select#team_comment_ids")
+      should have_selector('select#team_comment_ids')
     end
   end
 
-  describe "secondary navigation" do
-    it "has Gravatar image" do
+  describe 'secondary navigation' do
+    it 'has Gravatar image' do
       visit dashboard_path
-      should have_selector("ul.nav.pull-right li img")
+      should have_selector('ul.nav.pull-right li img')
     end
 
     it "does not show Gravatar when user doesn't have email method" do
       allow_any_instance_of(User).to receive(:respond_to?).and_return(true)
       allow_any_instance_of(User).to receive(:respond_to?).with(:email).and_return(false)
       visit dashboard_path
-      should_not have_selector("ul.nav.pull-right li img")
+      should_not have_selector('ul.nav.pull-right li img')
     end
 
-    it "does not cause error when email is nil" do
+    it 'does not cause error when email is nil' do
       allow_any_instance_of(User).to receive(:respond_to?).and_return(true)
       allow_any_instance_of(User).to receive(:respond_to?).with(:email).and_return(nil)
       visit dashboard_path
-      should have_selector("body.rails_admin")
+      should have_selector('body.rails_admin')
     end
 
-    it "shows a log out link" do
+    it 'shows a log out link' do
       visit dashboard_path
-      should have_content "Log out"
+      should have_content 'Log out'
     end
   end
 end

data/spec/integration/relation_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe "table relations" do
+describe 'table relations' do
 
-  before(:each) do
+  before do
     class RelTest < Tableless
       column :league_id, :integer
       column :division_id, :integer, nil, false
@@ -10,26 +10,26 @@ describe "table relations" do
       belongs_to :league
       belongs_to :division
       belongs_to :player
-      validates_numericality_of(:player_id, :only_integer => true)
+      validates_numericality_of(:player_id, only_integer: true)
     end
     @fields = RailsAdmin.config(RelTest).create.fields
   end
 
-  describe "column with nullable fk and no model validations" do
-    it "is optional" do
-      expect(@fields.find{ |f| f.name == :league }.required?).to be_false
+  describe 'column with nullable fk and no model validations' do
+    it 'is optional' do
+      expect(@fields.detect { |f| f.name == :league }.required?).to be_false
     end
   end
 
-  describe "column with non-nullable fk and no model validations" do
-    it "is not required" do
-      expect(@fields.find{ |f| f.name == :division }.required?).to be_false
+  describe 'column with non-nullable fk and no model validations' do
+    it 'is not required' do
+      expect(@fields.detect { |f| f.name == :division }.required?).to be_false
     end
   end
 
-  describe "column with nullable fk and a numericality model validation" do
-    it "is required" do
-      expect(@fields.find{ |f| f.name == :player }.required?).to be_true
+  describe 'column with nullable fk and a numericality model validation' do
+    it 'is required' do
+      expect(@fields.detect { |f| f.name == :player }.required?).to be_true
     end
   end
 end

data/spec/orm/active_record.rb

@@ -14,7 +14,7 @@ end
 class Tableless < ActiveRecord::Base
   class <<self
     def columns
-      @columns ||= [];
+      @columns ||= []
     end
 
     def column(name, sql_type = nil, default = nil, null = true)
@@ -23,15 +23,18 @@ class Tableless < ActiveRecord::Base
     end
 
     def columns_hash
-      @columns_hash ||= Hash[columns.map { |column| [column.name, column] }]
+      @columns_hash ||= Hash[columns.collect { |column| [column.name, column] }]
     end
 
     def column_names
-      @column_names ||= columns.map { |column| column.name }
+      @column_names ||= columns.collect { |column| column.name }
     end
 
     def column_defaults
-      @column_defaults ||= columns.map { |column| [column.name, nil] }.inject({}) { |m, e| m[e[0]] = e[1]; m }
+      @column_defaults ||= columns.collect { |column| [column.name, nil] }.inject({}) do |a, e|
+        a[e[0]] = e[1]
+        a
+      end
     end
   end
 

data/spec/orm/mongoid.rb

@@ -9,13 +9,7 @@ class Tableless
     def column(name, sql_type = 'string', default = nil, null = true)
       # ignore length
       sql_type = sql_type.to_s.sub(/\(.*\)/, '').to_sym
-      field name, :type => {
-        :integer => Integer,
-        :string => String,
-        :text => String,
-        :date => Date,
-        :datetime => DateTime,
-      }[sql_type], :default => default
+      field(name, type: {integer: Integer, string: String, text: String, date: Date, datetime: DateTime}[sql_type], default: default)
     end
   end
 end

data/spec/rails_admin/abstract_model_spec.rb

@@ -2,60 +2,60 @@ require 'spec_helper'
 
 describe RailsAdmin::AbstractModel do
 
-  describe "#to_s" do
+  describe '#to_s' do
     it 'returns model\'s name' do
       expect(RailsAdmin::AbstractModel.new(Cms::BasicPage).to_s).to eq Cms::BasicPage.to_s
     end
   end
 
-  describe "filters" do
+  describe 'filters' do
     before do
       @abstract_model = RailsAdmin::AbstractModel.new('FieldTest')
     end
 
-    context "ActiveModel::ForbiddenAttributesProtection" do
-      it "is present" do
-        @abstract_model.model.ancestors.map(&:to_s).include?('ActiveModel::ForbiddenAttributesProtection')
+    context 'ActiveModel::ForbiddenAttributesProtection' do
+      it 'is present' do
+        @abstract_model.model.ancestors.collect(&:to_s).include?('ActiveModel::ForbiddenAttributesProtection')
       end
     end
 
-    context "on dates" do
-      it "lists elements within outbound limits" do
-        date_format = I18n.t("admin.misc.filter_date_format", :default => I18n.t("admin.misc.filter_date_format", :locale => :en)).gsub('dd', '%d').gsub('mm', '%m').gsub('yy', '%Y')
+    context 'on dates' do
+      it 'lists elements within outbound limits' do
+        date_format = I18n.t('admin.misc.filter_date_format', default: I18n.t('admin.misc.filter_date_format', locale: :en)).gsub('dd', '%d').gsub('mm', '%m').gsub('yy', '%Y')
 
         %w[01/01/2012 01/02/2012 01/03/2012 01/04/2012].each do |date|
-          FactoryGirl.create(:field_test, :date_field => Date.strptime(date, date_format))
+          FactoryGirl.create(:field_test, date_field: Date.strptime(date, date_format))
         end
-        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)
+        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
 
-    context "on datetimes" do
-      it "lists elements within outbound limits" do
-        FactoryGirl.create(:field_test, :datetime_field => Time.local(2012, 1, 1, 23, 59, 59))
-        FactoryGirl.create(:field_test, :datetime_field => Time.local(2012, 1, 2, 0, 0, 0))
-        FactoryGirl.create(:field_test, :datetime_field => Time.local(2012, 1, 3, 23, 59, 59))
+    context 'on datetimes' do
+      it 'lists elements within outbound limits' do
+        FactoryGirl.create(:field_test, datetime_field: Time.local(2012, 1, 1, 23, 59, 59))
+        FactoryGirl.create(:field_test, datetime_field: Time.local(2012, 1, 2, 0, 0, 0))
+        FactoryGirl.create(:field_test, datetime_field: Time.local(2012, 1, 3, 23, 59, 59))
         if defined?(Mongoid) && Mongoid::VERSION >= '3.0.0'
           # TODO: Mongoid 3.0.0 mysteriously expands the range of inclusion slightly...
-          FactoryGirl.create(:field_test, :datetime_field => Time.local(2012, 1, 4, 0, 0, 1))
+          FactoryGirl.create(:field_test, datetime_field: Time.local(2012, 1, 4, 0, 0, 1))
         else
-          FactoryGirl.create(:field_test, :datetime_field => Time.local(2012, 1, 4, 0, 0, 0))
+          FactoryGirl.create(:field_test, datetime_field: Time.local(2012, 1, 4, 0, 0, 0))
         end
-        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)
+        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
 
-  context "with Kaminari" do
+  context 'with Kaminari' do
     before do
       @paged = Player.page(1)
       Kaminari.config.page_method_name = :per_page_kaminari
@@ -68,7 +68,7 @@ describe RailsAdmin::AbstractModel do
 
     it "supports pagination when Kaminari's page_method_name is customized" do
       expect(Player).to receive(:per_page_kaminari).once.and_return(@paged)
-      @abstract_model.all(:sort => PK_COLUMN, :page => 1, :per => 2)
+      @abstract_model.all(sort: PK_COLUMN, page: 1, per: 2)
     end
   end
 end

data/spec/rails_admin/active_record_extension_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 require File.expand_path('../../../config/initializers/active_record_extensions', __FILE__)
 
-describe "ActiveRecord::Base", :active_record => true do
-  describe "#safe_send" do
-    it "only calls #read_attribute once" do
+describe 'ActiveRecord::Base', active_record: true do
+  describe '#safe_send' do
+    it 'only calls #read_attribute once' do
       @player = Player.new
       @player.number = 23
       original_method = @player.method(:read_attribute)

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

@@ -1,30 +1,30 @@
 require 'spec_helper'
 
-describe "RailsAdmin::Adapters::ActiveRecord::AbstractObject", :active_record => true do
-  describe "proxy" do
-    let(:object) { double("object") }
+describe 'RailsAdmin::Adapters::ActiveRecord::AbstractObject', active_record: true do
+  describe 'proxy' do
+    let(:object) { double('object') }
     let(:abstract_object) { RailsAdmin::Adapters::ActiveRecord::AbstractObject.new(object) }
 
-    it "acts like a proxy" do
+    it 'acts like a proxy' do
       expect(object).to receive(:method_call)
       abstract_object.method_call
     end
   end
 
-  describe "create" do
+  describe 'create' do
     let(:player) { Player.new }
     let(:object) { RailsAdmin::Adapters::ActiveRecord::AbstractObject.new player }
-    let(:name) { "Stefan Kiszonka" }
+    let(:name) { 'Stefan Kiszonka' }
     let(:number) { 87 }
-    let(:position) { "Fifth baseman" }
+    let(:position) { 'Fifth baseman' }
     let(:suspended) { true }
 
-    describe "a record without associations" do
+    describe 'a record without associations' do
       before do
-        object.set_attributes({ :name => name, :number => number, :position => position, :suspended => suspended, :team_id => nil })
+        object.set_attributes(name: name, number: number, position: position, suspended: suspended, team_id: nil)
       end
 
-      it "creates a Player with given attributes" do
+      it 'creates a Player with given attributes' do
         expect(object.save).to be_true
 
         player.reload
@@ -37,15 +37,15 @@ describe "RailsAdmin::Adapters::ActiveRecord::AbstractObject", :active_record =>
       end
     end
 
-    describe "a record with has_one association" do
+    describe 'a record with has_one association' do
       let(:draft) { FactoryGirl.create(:draft) }
       let(:number) { draft.player.number + 1 } # to avoid collision
 
       before do
-        object.set_attributes({ :name => name, :number => number, :position => position, :suspended => suspended, :team_id => nil, :draft_id => draft.id })
+        object.set_attributes(name: name, number: number, position: position, suspended: suspended, team_id: nil, draft_id: draft.id)
       end
 
-      it "creates a Player with given attributes" do
+      it 'creates a Player with given attributes' do
         expect(object.save).to be_true
 
         player.reload
@@ -58,18 +58,18 @@ describe "RailsAdmin::Adapters::ActiveRecord::AbstractObject", :active_record =>
       end
     end
 
-    describe "a record with has_many associations" do
+    describe 'a record with has_many associations' do
       let(:league) { League.new }
       let(:object) { RailsAdmin::Adapters::ActiveRecord::AbstractObject.new league }
-      let(:name) { "Awesome League" }
+      let(:name) { 'Awesome League' }
       let(:teams) { [FactoryGirl.create(:team)] }
-      let(:divisions) { [Division.create!(:name => 'div 1', :league => League.create!(:name => 'north')), Division.create!(:name => 'div 2', :league => League.create!(:name => 'south'))] }
+      let(:divisions) { [Division.create!(name: 'div 1', league: League.create!(name: 'north')), Division.create!(name: 'div 2', league: League.create!(name: 'south'))] }
 
       before do
-        object.set_attributes({ :name  => name, :division_ids => divisions.map(&:id) })
+        object.set_attributes(name: name, division_ids: divisions.collect(&:id))
       end
 
-      it "creates a League with given attributes and associations" do
+      it 'creates a League with given attributes and associations' do
         expect(object.save).to be_true
         league.reload
         expect(league.name).to eq(name)
@@ -78,11 +78,11 @@ describe "RailsAdmin::Adapters::ActiveRecord::AbstractObject", :active_record =>
     end
   end
 
-  describe "update" do
-    describe "a record with has_one association" do
-      let(:name) { "Stefan Koza" }
+  describe 'update' do
+    describe 'a record with has_one association' do
+      let(:name) { 'Stefan Koza' }
       let(:suspended) { true }
-      let(:player) { FactoryGirl.create(:player, :suspended => true, :name => name, :draft => FactoryGirl.create(:draft)) }
+      let(:player) { FactoryGirl.create(:player, suspended: true, name: name, draft: FactoryGirl.create(:draft)) }
       let(:object) { RailsAdmin::Adapters::ActiveRecord::AbstractObject.new player }
       let(:new_team) { FactoryGirl.create(:team) }
       let(:new_suspended) { false }
@@ -90,11 +90,11 @@ describe "RailsAdmin::Adapters::ActiveRecord::AbstractObject", :active_record =>
       let(:new_number) { player.number + 29 }
 
       before do
-        object.set_attributes({ :number => new_number, :team_id => new_team.id, :suspended => new_suspended, :draft_id => new_draft })
+        object.set_attributes(number: new_number, team_id: new_team.id, suspended: new_suspended, draft_id: new_draft)
         object.save
       end
 
-      it "updates a record and associations" do
+      it 'updates a record and associations' do
         object.reload
         expect(object.number).to eq(new_number)
         expect(object.name).to eq(name)
@@ -105,7 +105,7 @@ describe "RailsAdmin::Adapters::ActiveRecord::AbstractObject", :active_record =>
     end
   end
 
-  describe "destroy" do
+  describe 'destroy' do
     let(:player) { FactoryGirl.create(:player) }
     let(:object) { RailsAdmin::Adapters::ActiveRecord::AbstractObject.new player }
 
@@ -113,20 +113,20 @@ describe "RailsAdmin::Adapters::ActiveRecord::AbstractObject", :active_record =>
       object.destroy
     end
 
-    it "deletes the record" do
+    it 'deletes the record' do
       expect(Player.exists?(player.id)).to be_false
     end
   end
 
-  describe "object_label_method" do
-    it "is configurable" do
+  describe 'object_label_method' do
+    it 'is configurable' do
       RailsAdmin.config League do
         object_label_method { :custom_name }
       end
 
       @league = FactoryGirl.create :league
 
-      expect(RailsAdmin.config('League').with(:object => @league).object_label).to eq("League '#{@league.name}'")
+      expect(RailsAdmin.config('League').with(object: @league).object_label).to eq("League '#{@league.name}'")
     end
   end
 end