activeadmin 0.5.1 → 0.6.0

data/spec/unit/namespace_spec.rb

@@ -23,9 +23,9 @@ describe ActiveAdmin::Namespace do
       if ActiveAdmin::Dashboards.built?
         # DEPRECATED behavior. If a dashboard was built while running this
         # spec, then an item gets added to the menu
-        namespace.menu.should have(1).item
+        namespace.fetch_menu(:default).children.should_not be_empty
       else
-        namespace.menu.items.should be_empty
+        namespace.fetch_menu(:default).children.should be_empty
       end
     end
   end # context "when new"
@@ -45,4 +45,65 @@ describe ActiveAdmin::Namespace do
     end
   end
 
+
+  describe "#fetch_menu" do
+    let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
+
+    it "returns the menu" do
+      namespace.fetch_menu(:default).should be_an_instance_of(ActiveAdmin::Menu)
+    end
+
+    it "should have utility nav menu" do
+      namespace.fetch_menu(:utility_navigation).should be_an_instance_of(ActiveAdmin::Menu)
+    end
+
+    it "should raise an exception if the menu doesn't exist" do
+      expect {
+        namespace.fetch_menu(:not_a_menu_that_exists)
+      }.to raise_error(KeyError)
+    end
+  end
+
+  describe "#build_menu" do
+    let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
+
+    it "should set the block as a menu build callback" do
+      namespace.build_menu do |menu|
+        menu.add :label => "menu item"
+      end
+
+      namespace.fetch_menu(:default)["menu item"].should_not be_nil
+    end
+
+    it "should set a block on a custom menu" do
+      namespace.build_menu :test do |menu|
+        menu.add :label => "menu item"
+      end
+
+      namespace.fetch_menu(:test)["menu item"].should_not be_nil
+    end
+  end
+
+  describe "utility navigation" do
+    let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
+    let(:menu) do 
+      namespace.build_menu :utility_navigation do |menu|
+        menu.add :label => "ActiveAdmin.info", :url => "http://www.activeadmin.info", :html_options => { :target => :blank }
+        namespace.add_logout_button_to_menu menu, 1, :class => "matt"
+      end
+      namespace.fetch_menu(:utility_navigation)
+    end
+
+    it "should have a logout button to the far left" do
+      menu["Logout"].should_not be_nil
+      menu["Logout"].priority.should == 1
+    end
+
+    it "should have a static link with a target of :blank" do
+      menu["ActiveAdmin.info"].should_not be_nil
+      menu["ActiveAdmin.info"].html_options.should include(:target => :blank)
+    end
+
+  end
+
 end

data/spec/unit/page_controller_spec.rb

@@ -1,8 +1,5 @@
 require 'spec_helper'
-require File.expand_path('base_controller_shared_examples', File.dirname(__FILE__))
 
 describe ActiveAdmin::PageController do
   let(:controller) { ActiveAdmin::PageController.new }
-
-  it_should_behave_like "BaseController"
 end

data/spec/unit/reloader_spec.rb

@@ -23,13 +23,13 @@ describe ActiveAdmin::Reloader do
   let(:reloader){ ActiveAdmin::Reloader.build(rails_app, mock_app, rails_version) }
 
   context "when Rails version < 3.2" do
-    let(:rails_version){ "3.1.0" }
+    let(:rails_version){ TRAVIS_RAILS_VERSIONS.grep(/^3.1/).first }
 
     describe "initialization" do
 
       it "should initialize a new file update checker" do
         ActiveSupport::FileUpdateChecker.should_receive(:new).with(mock_app.load_paths).and_return(mock(:execute_if_updated => true))
-        ActiveAdmin::Reloader.build(rails_app, mock_app, '3.1.0')
+        ActiveAdmin::Reloader.build(rails_app, mock_app, TRAVIS_RAILS_VERSIONS.grep(/^3.1/).first)
       end
 
       it "should build a RailsLessThan31Reloader" do
@@ -41,12 +41,12 @@ describe ActiveAdmin::Reloader do
     describe "#reloader_class" do
 
       it "should use ActionDispatch::Reloader if rails 3.1" do
-        reloader = ActiveAdmin::Reloader.build rails_app, mock_app, '3.1.0'
+        reloader = ActiveAdmin::Reloader.build rails_app, mock_app, TRAVIS_RAILS_VERSIONS.grep(/^3.1/).first
         reloader.reloader_class.should == ActionDispatch::Reloader
       end
 
       it "should use ActionDispatch::Callbacks if rails 3.0" do
-        reloader = ActiveAdmin::Reloader.build rails_app, mock_app, '3.0.0'
+        reloader = ActiveAdmin::Reloader.build rails_app, mock_app, TRAVIS_RAILS_VERSIONS.grep(/^3.0/).first
         reloader.reloader_class.should == ActionDispatch::Callbacks
       end
 
@@ -94,7 +94,7 @@ describe ActiveAdmin::Reloader do
   end
 
   context "when Rails >= 3.2" do
-    let(:rails_version){ "3.2.0" }
+    let(:rails_version){ TRAVIS_RAILS_VERSIONS.grep(/^3.2/).first }
 
     describe "initialization" do
 

data/spec/unit/resource/menu_spec.rb

@@ -12,19 +12,7 @@ module ActiveAdmin
       @config ||= Resource.new(namespace, Category, options)
     end
 
-    describe "#include_in_menu?" do
-      let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
-      subject{ resource }
+    # TODO...
 
-      context "when belongs to" do
-        let(:resource){ namespace.register(Post){ belongs_to :author } }
-        it { should_not be_include_in_menu }
-      end
-
-      context "when belongs to optional" do
-        let(:resource){ namespace.register(Post){ belongs_to :author, :optional => true} }
-        it { should be_include_in_menu }
-      end
-    end
   end
 end

data/spec/unit/resource/naming_spec.rb

@@ -61,7 +61,7 @@ module ActiveAdmin
       describe "I18n integration" do
         describe "singular label" do
           it "should return the titleized model_name.human" do
-            config.resource_name.should_receive(:human).and_return "Da category"
+            config.resource_name.should_receive(:translate).and_return "Da category"
 
             config.resource_label.should == "Da category"
           end
@@ -69,11 +69,29 @@ module ActiveAdmin
 
         describe "plural label" do
           it "should return the titleized plural version defined by i18n if available" do
-            I18n.should_receive(:translate).at_least(:once).and_return("Da categories")
+            config.resource_name.should_receive(:translate).at_least(:once).and_return "Da categories"
             config.plural_resource_label.should == "Da categories"
           end
         end
 
+        context "when the :as option is given" do
+          describe "singular label" do
+            it "should translate the custom name" do
+              config = config(:as => 'My Category')
+              config.resource_name.should_receive(:translate).and_return "Translated category"
+              config.resource_label.should == "Translated category"
+            end
+          end
+
+          describe "plural label" do
+            it "should translate the custom name" do
+              config = config(:as => 'My Category')
+              config.resource_name.should_receive(:translate).at_least(:once).and_return "Translated categories"
+              config.plural_resource_label.should == "Translated categories"
+            end
+          end
+        end
+
       end
     end
 

data/spec/unit/resource/page_presenters_spec.rb

@@ -9,10 +9,16 @@ describe ActiveAdmin::Resource::PagePresenters do
     resource.page_presenters.should == {}
   end
 
-  it "should add a page presenter" do
+  it "should add a show page presenter" do
     page_presenter = ActiveAdmin::PagePresenter.new
+    resource.set_page_presenter(:show, page_presenter)
+    resource.page_presenters[:show].should == page_presenter
+  end
+
+  it "should add an index page presenter" do
+    page_presenter = ActiveAdmin::PagePresenter.new({:as => :table})
     resource.set_page_presenter(:index, page_presenter)
-    resource.page_presenters[:index].should == page_presenter
+    resource.page_presenters[:index].default.should == page_presenter
   end
 
   describe "#get_page_presenter" do
@@ -23,6 +29,12 @@ describe ActiveAdmin::Resource::PagePresenters do
       resource.get_page_presenter(:index).should == page_presenter
     end
 
+    it "should return a specific index page config when set" do
+      page_presenter = ActiveAdmin::PagePresenter.new
+      resource.set_page_presenter(:index, page_presenter)
+      resource.get_page_presenter(:index, "table").should == page_presenter
+    end
+
     it "should return nil when no page config set" do
       resource.get_page_presenter(:index).should == nil
     end

data/spec/unit/resource_controller/{collection_spec.rb → data_access_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ActiveAdmin::ResourceController::Collection do
+describe ActiveAdmin::ResourceController::DataAccess do
   let(:params) do
     {}
   end
@@ -13,29 +13,45 @@ describe ActiveAdmin::ResourceController::Collection do
     rc
   end
 
-  describe ActiveAdmin::ResourceController::Collection::Search do
+  describe "searching" do
     let(:params){ {:q => {} }}
+
     it "should call the metasearch method" do
       chain = mock("ChainObj")
       chain.should_receive(:metasearch).with(params[:q]).once.and_return(Post.search)
-      controller.send :search, chain
+      controller.send :apply_filtering, chain
     end
+
   end
 
-  describe ActiveAdmin::ResourceController::Collection::Sorting do
-    let(:params){ {:order => "id_asc" }}
-    it "should prepend the table name" do
-      chain = mock("ChainObj")
-      chain.should_receive(:reorder).with("\"posts\".\"id\" asc").once.and_return(Post.search)
-      controller.send :sort_order, chain
+  describe "sorting" do
+
+    context "for table columns" do
+      let(:params){ {:order => "id_asc" }}
+      it "should prepend the table name" do
+        chain = mock("ChainObj")
+        chain.should_receive(:reorder).with("\"posts\".\"id\" asc").once.and_return(Post.search)
+        controller.send :apply_sorting, chain
+      end
     end
+
+    context "for virtual columns" do
+      let(:params){ {:order => "virtual_id_asc" }}
+      it "should not prepend the table name" do
+        chain = mock("ChainObj")
+        chain.should_receive(:reorder).with("\"virtual_id\" asc").once.and_return(Post.search)
+        controller.send :apply_sorting, chain
+      end
+    end
+
   end
-  
-  describe ActiveAdmin::ResourceController::Collection::Scoping, "#scope_current_collection" do
+
+  describe "scoping" do
+
     context "when no current scope" do
       it "should set collection_before_scope to the chain and return the chain" do
         chain = mock("ChainObj")
-        controller.send(:scope_current_collection, chain).should == chain
+        controller.send(:apply_scoping, chain).should == chain
         controller.send(:collection_before_scope).should == chain
       end
     end
@@ -48,9 +64,11 @@ describe ActiveAdmin::ResourceController::Collection do
         controller.stub!(:current_scope) { current_scope }
 
         controller.should_receive(:scope_chain).with(current_scope, chain) { scoped_chain }
-        controller.send(:scope_current_collection, chain).should == scoped_chain
+        controller.send(:apply_scoping, chain).should == scoped_chain
         controller.send(:collection_before_scope).should == chain
       end
     end
+
   end
+
 end

data/spec/unit/resource_controller_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require File.expand_path('base_controller_shared_examples', File.dirname(__FILE__))
 
 describe ActiveAdmin::ResourceController do
 
@@ -7,8 +6,6 @@ describe ActiveAdmin::ResourceController do
 
   let(:controller) { ActiveAdmin::ResourceController.new }
 
-  it_should_behave_like "BaseController"
-
   describe "authenticating the user" do
     let(:controller){ Admin::PostsController.new }
 
@@ -115,10 +112,10 @@ describe ActiveAdmin::ResourceController do
     describe "performing update" do
       let(:controller){ Admin::PostsController.new }
       let(:resource){ mock("Resource", :attributes= => true, :save => true) }
-      let(:attributes){ {} }
+      let(:attributes){ [{}] }
 
       before do
-        resource.should_receive(:attributes=).with(attributes)
+        resource.should_receive(:attributes=).with(attributes[0])
         resource.should_receive(:save)
       end
 
@@ -166,6 +163,7 @@ describe Admin::PostsController, :type => "controller" do
   describe 'retreiving the resource' do
     let(:controller){ Admin::PostsController.new }
     let(:post) { Post.new :title => "An incledibly unique Post Title" }
+
     before do
       Post.stub(:find).and_return(post)
       controller.class_eval { public :resource }
@@ -173,6 +171,7 @@ describe Admin::PostsController, :type => "controller" do
     end
 
     subject { controller.resource }
+
     it "returns a Post" do
       subject.should be_kind_of(Post)
     end

data/spec/unit/resource_spec.rb

@@ -28,6 +28,12 @@ module ActiveAdmin
       end
     end
 
+    describe "#resource_column_names" do
+      it "should return the resource's column names" do
+        config.resource_column_names.should == Category.column_names
+      end
+    end
+
     describe '#decorator_class' do
       it 'returns nil by default' do
         config.decorator_class.should be_nil
@@ -65,26 +71,35 @@ module ActiveAdmin
         let(:resource){ namespace.register(Post) }
         it { should be_include_in_menu }
       end
-      context "when belongs to" do
-        let(:resource){ namespace.register(Post){ belongs_to :author } }
-        it { should_not be_include_in_menu }
-      end
-      context "when belongs to optional" do
-        let(:resource){ namespace.register(Post){ belongs_to :author, :optional => true} }
-        it { should be_include_in_menu }
-      end
+
       context "when menu set to false" do
         let(:resource){ namespace.register(Post){ menu false } }
         it { should_not be_include_in_menu }
       end
     end
 
+    describe "#belongs_to" do
+
+      it "should build a belongs to configuration" do
+        config.belongs_to_config.should be_nil
+        config.belongs_to :posts
+        config.belongs_to_config.should_not be_nil
+      end
+
+      it "should set the target menu to the belongs to target" do
+        config.menu_item_menu_name.should == ActiveAdmin::DEFAULT_MENU
+        config.belongs_to :posts
+        config.menu_item_menu_name.should == :posts
+      end
+
+    end
+
     describe "route names" do
       it "should return the route prefix" do
         config.route_prefix.should == "admin"
       end
       it "should return the route collection path" do
-        config.route_collection_path.should == :admin_categories_path
+        config.route_collection_path.should == "/admin/categories"
       end
 
       context "when in the root namespace" do
@@ -92,14 +107,21 @@ module ActiveAdmin
         it "should have a nil route_prefix" do
           config.route_prefix.should == nil
         end
+
+        it "should generate a correct route" do
+          config
+          reload_routes!
+          config.route_collection_path.should == "/categories"
+        end
       end
 
       context "when registering a plural resource" do
         class ::News; def self.has_many(*); end end
 
-        let(:config){ application.register News }
         it "should return the plurali route with _index" do
-          config.route_collection_path.should == :admin_news_index_path
+          config = application.register News
+          reload_routes!
+          config.route_collection_path.should == "/admin/news"
         end
       end
     end

data/spec/unit/routing_spec.rb

@@ -111,6 +111,49 @@ describe ActiveAdmin, "Routing", :type => :routing do
         edit_post_path(1).should == "/posts/1/edit"
       end
     end
+
+    context "with member action" do
+      context "without an http verb" do
+        before do
+          load_resources do 
+            ActiveAdmin.register(Post){ member_action "do_something" }
+          end
+        end
+
+        it "should default to GET" do
+          {:get  => "/admin/posts/1/do_something"}.should     be_routable
+          {:post => "/admin/posts/1/do_something"}.should_not be_routable
+        end
+      end
+
+      context "with one http verb" do
+        before do
+          load_resources do 
+            ActiveAdmin.register(Post){ member_action "do_something", :method => :post }
+          end
+        end
+
+        it "should properly route" do
+          {:post => "/admin/posts/1/do_something"}.should be_routable
+        end
+      end
+
+      context "with two http verbs" do
+        before do
+          load_resources do 
+            ActiveAdmin.register(Post){ member_action "do_something", :method => [:put, :delete] }
+          end
+        end
+
+        it "should properly route the first verb" do
+          {:put => "/admin/posts/1/do_something"}.should be_routable
+        end
+
+        it "should properly route the second verb" do        
+          {:delete => "/admin/posts/1/do_something"}.should be_routable     
+        end
+      end
+    end
   end
 
   describe "belongs to resource" do