andrewroth_activeadmin 0.3.4.3 → 0.3.4.4

data/spec/unit/menu_item_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper' 
+require 'spec_helper_without_rails'
+require 'active_admin/menu_item'
 
 module ActiveAdmin
   describe MenuItem do
@@ -7,27 +8,27 @@ module ActiveAdmin
       item = MenuItem.new("Dashboard", "/admin")
       item.name.should == "Dashboard"
     end
-    
+
     it "should have a url" do
       item = MenuItem.new("Dashboard", "/admin")
       item.url.should == "/admin"
     end
-    
+
     it "should have a priority of 10 by default" do
       item = MenuItem.new("Dashboard", "/admin")
       item.priority.should == 10
     end
-    
+
     it "should accept an optional options hash" do
       item = MenuItem.new("Dashboard", "/admin", 10, :if => lambda{ logged_in? } )
     end
-    
+
     it "should have a display if block" do
       block = lambda{ logged_in? }
       item = MenuItem.new("Dashboard", "/admin", 10, :if => block )
       item.display_if_block.should == block
     end
-    
+
     it "should have a default display if block always returning true" do
       item = MenuItem.new("Dashboard", "/admin")
       item.display_if_block.should be_instance_of(Proc)
@@ -36,20 +37,24 @@ module ActiveAdmin
 
     describe "url generation and caching" do
       it "should generate a url if it is a symbol" do
-        MenuItem.new("Posts", :admin_posts_path).url.should == "/admin/posts"
+        item = MenuItem.new("Posts", :admin_posts_path)
+        MenuItem.should_receive(:generate_url).with(:admin_posts_path).
+          and_return("/admin/posts")
+
+        item.url.should == "/admin/posts"
       end
 
       it "should generate a url if it is a string" do
         MenuItem.new("Posts", "/admin/posts").url.should == "/admin/posts"
       end
     end
-    
+
     context "with no children" do
       it "should be empty" do
         item = MenuItem.new("Blog", "/admin/blog")
         item.children.should == []
       end
-      
+
       it "should accept new children" do
         item = MenuItem.new("Blog", "/admin/blog")
         item.add "Dashboard", "/admin"
@@ -57,7 +62,7 @@ module ActiveAdmin
         item.children.first.name.should == "Dashboard"
       end
     end
-    
+
     context "with many children" do
       let(:item) do
         i = MenuItem.new("Dashboard", "/admin")
@@ -68,11 +73,11 @@ module ActiveAdmin
         i.add "Analytics", "/", 44
         i
       end
-      
+
       it "should give access to the menu item as an array" do
         item['Blog'].name.should == 'Blog'
       end
-      
+
       it "should sort items based on priority and name" do    
         item.children[0].name.should == 'Users'
         item.children[1].name.should == 'Settings'
@@ -80,12 +85,12 @@ module ActiveAdmin
         item.children[3].name.should == 'Cars'
         item.children[4].name.should == 'Analytics'
       end
-      
+
       it "children should hold a reference to their parent" do
         item["Blog"].parent.should == item
       end
     end
-    
+
     describe "building children using block syntax" do
       let(:item) do
         MenuItem.new("Blog", "/") do |blog|
@@ -95,25 +100,25 @@ module ActiveAdmin
           end
         end
       end
-      
+
       it "should have 2 children" do
         item.children.size.should == 2
       end
-      
+
       it "should have sub-sub items" do
         item["Comments"]["Approved"].name.should == 'Approved'
       end
     end
-    
+
     describe "accessing ancestory" do
       let(:item){ MenuItem.new "Blog", "/blog" }
-      
+
       context "with no parent" do
         it "should return an empty array" do
          item.ancestors.should == [] 
         end
       end
-      
+
       context "with one parent" do
         let(:sub_item) do 
           item.add "Create New", "/blog/new"
@@ -123,7 +128,7 @@ module ActiveAdmin
           sub_item.ancestors.should == [item]
         end
       end
-      
+
       context "with many parents" do
         before(:each) do
           item.add "C1", "/c1" do |c1|

data/spec/unit/views/tabbed_navigation_spec.rb

@@ -80,7 +80,8 @@ describe ActiveAdmin::Views::TabbedNavigation do
 
       it "should add the 'current' and 'has_nested' classes to the li and 'current' to the sub li" do
         assigns[:current_tab] = "Reports/A Sub Reports"
-        html.should have_tag("li", :attributes => { :id => "reports", :class => "current has_nested" })
+        html.should have_tag("li", :attributes => { :id => "reports", :class => /current/ })
+        html.should have_tag("li", :attributes => { :id => "reports", :class => /has_nested/ })
         html.should have_tag("li", :attributes => { :id => "a_sub_reports", :class => "current" })
       end
 

data/tasks/test.rake

@@ -11,28 +11,30 @@ task :test => ['spec:unit', 'spec:integration', 'cucumber', 'cucumber:class_relo
 
 namespace :test do
 
-  desc "Run the full suite against the important versions of rails"
-  task :major_supported_rails do
+  def run_tests_against(*versions)
     current_version = detect_rails_version if File.exists?("Gemfile.lock")
 
-    ["3.0.10", "3.1.0"].each do |version|
+    versions.each do |version|
       puts
       puts "== Using Rails #{version}"
 
-      if File.exists?("Gemfile.lock")
-        puts "Removing the current Gemfile.lock"
-        cmd "rm Gemfile.lock"
-      end
-
-      cmd "export RAILS=#{version} && ./script/use_rails #{version}"
-      cmd "export RAILS=#{version} && bundle exec rspec spec/unit"
-      cmd "export RAILS=#{version} && bundle exec rspec spec/integration"
-      cmd "export RAILS=#{version} && bundle exec cucumber features"
-      cmd "export RAILS=#{version} && bundle exec cucumber -p class-reloading features"
+      cmd "./script/use_rails #{version}"
+      cmd "bundle exec rspec spec"
+      cmd "bundle exec cucumber features"
+      cmd "bundle exec cucumber -p class-reloading features"
     end
+
     cmd "./script/use_rails #{current_version}" if current_version
   end
 
+  desc "Run the full suite against the important versions of rails"
+  task :major_supported_rails do
+    run_tests_against "3.0.11", "3.1.3"
+  end
+
+  desc "Alias for major_supported_rails"
+  task :all => :major_supported_rails
+
 end
 
 require 'rspec/core/rake_task'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: andrewroth_activeadmin
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 79
   prerelease: 
   segments: 
   - 0
   - 3
   - 4
-  - 3
-  version: 0.3.4.3
+  - 4
+  version: 0.3.4.4
 platform: ruby
 authors: 
 - Greg Bell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-03 00:00:00 -05:00
+date: 2012-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,12 +139,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 43
         segments: 
         - 0
-        - 12
-        - 4
-        version: 0.12.4
+        - 13
+        - 0
+        version: 0.13.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -339,7 +339,6 @@ files:
 - lib/active_admin/arbre.rb
 - lib/active_admin/arbre/builder.rb
 - lib/active_admin/arbre/context.rb
-- lib/active_admin/arbre/core_extensions.rb
 - lib/active_admin/arbre/html/attributes.rb
 - lib/active_admin/arbre/html/class_list.rb
 - lib/active_admin/arbre/html/collection.rb
@@ -504,6 +503,7 @@ files:
 - spec/integration/memory_spec.rb
 - spec/integration/stylesheets_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_without_rails.rb
 - spec/support/detect_rails_version.rb
 - spec/support/integration_example_group.rb
 - spec/support/jslint.yml
@@ -678,6 +678,7 @@ test_files:
 - spec/integration/memory_spec.rb
 - spec/integration/stylesheets_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_without_rails.rb
 - spec/support/detect_rails_version.rb
 - spec/support/integration_example_group.rb
 - spec/support/jslint.yml

data/lib/active_admin/arbre/core_extensions.rb

@@ -1,5 +0,0 @@
-class Object
-  def to_html
-    to_s
-  end
-end