rails_admin 0.0.1 → 0.0.2

data/spec/integration/history/rails_admin_history_spec.rb

@@ -25,6 +25,23 @@ describe "RailsAdmin History", :active_record => true do
       histories.count.should == 15
     end
 
+    context "with Kaminari" do
+      before do
+        Kaminari.config.page_method_name = :per_page_kaminari
+        @paged = RailsAdmin::History.page(1)
+      end
+
+      after do
+        Kaminari.config.page_method_name = :page
+      end
+
+      it "supports pagination when Kaminari's page_method_name is customized" do
+        RailsAdmin::History.should_receive(:per_page_kaminari).twice.and_return(@paged)
+        RailsAdmin::History.history_for_model @model, nil, false, false, false, nil
+        RailsAdmin::History.history_for_object @model, Player.first, nil, false, false, false, nil
+      end
+    end
+
     context "GET admin/history/@model" do
       before :each do
         RailsAdmin.config do |c|

data/spec/integration/rails_admin_spec.rb

@@ -41,7 +41,8 @@ describe "RailsAdmin" do
   end
 
   describe 'hidden fields with default values' do
-    it "should show up with default value, hidden" do
+    
+    before (:each) do
       RailsAdmin.config Player do
         include_all_fields
         edit do
@@ -52,11 +53,21 @@ describe "RailsAdmin" do
           end
         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
   end
 
   describe '_current_user' do # https://github.com/sferik/rails_admin/issues/549

data/spec/unit/abstract_model_spec.rb

@@ -42,4 +42,21 @@ describe RailsAdmin::AbstractModel do
       end
     end
   end
+
+  context "with Kaminari" do
+    before do
+      Kaminari.config.page_method_name = :per_page_kaminari
+      @abstract_model = RailsAdmin::AbstractModel.new('Player')
+      @paged = Player.page(1)
+    end
+
+    after do
+      Kaminari.config.page_method_name = :page
+    end
+
+    it "supports pagination when Kaminari's page_method_name is customized" do
+      Player.should_receive(:per_page_kaminari).once.and_return(@paged)
+      @abstract_model.all(:sort => PK_COLUMN, :page => 1, :per => 2)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bbenezech-nested_form
@@ -133,7 +133,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.17
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -1041,9 +1041,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2534389094199931676
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1052,7 +1049,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Admin for Rails
@@ -1332,3 +1329,4 @@ test_files:
 - spec/unit/config/sections_spec.rbc
 - spec/unit/config_spec.rb
 - spec/unit/config_spec.rbc
+has_rdoc: