From ee4a1925fe91c904138670eecbd06ce8e26da537 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sat, 6 Sep 2014 00:34:27 +1000
Subject: [PATCH] Bulk Order Management works with navigation helper override

---
 .../spree/admin/navigation_helper_decorator.rb     |  1 +
 spec/features/admin/bulk_order_management_spec.rb  | 14 +++++++-------
 spec/helpers/navigation_helper_spec.rb             |  4 ++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/helpers/spree/admin/navigation_helper_decorator.rb b/app/helpers/spree/admin/navigation_helper_decorator.rb
index 024f467154..eb210ef482 100644
--- a/app/helpers/spree/admin/navigation_helper_decorator.rb
+++ b/app/helpers/spree/admin/navigation_helper_decorator.rb
@@ -8,6 +8,7 @@ module Spree
         klass = klass_for_without_sym_fallback(name)
         klass ||= name.singularize.to_sym
         klass = :overview if klass == :dashboard
+        klass = Spree::Order if klass == :bulk_order_management
         klass
       end
       alias_method_chain :klass_for, :sym_fallback
diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index a8fe6cbda7..fe18f1a9bf 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -15,13 +15,6 @@ feature %q{
       admin_user = quick_login_as_admin
     end
 
-    it "displays a Bulk Management Tab under the Orders item" do
-      visit '/admin/orders'
-      page.should have_link "Bulk Order Management"
-      click_link "Bulk Order Management"
-      page.should have_selector "h1.page-title", text: "Bulk Order Management"
-    end
-
     it "displays a message when number of line items is zero" do
       visit '/admin/orders/bulk_management'
       page.should have_text "No orders found."
@@ -586,6 +579,13 @@ feature %q{
       quick_login_as @enterprise_user
     end
 
+    it "displays a Bulk Management Tab under the Orders item" do
+      visit '/admin/orders'
+      page.should have_link "Bulk Order Management"
+      click_link "Bulk Order Management"
+      page.should have_selector "h1.page-title", text: "Bulk Order Management"
+    end
+
     it "shows only line item from orders that I distribute, and not those that I supply" do
       visit '/admin/orders/bulk_management'
 
diff --git a/spec/helpers/navigation_helper_spec.rb b/spec/helpers/navigation_helper_spec.rb
index 41decd6e5a..76fe9573f2 100644
--- a/spec/helpers/navigation_helper_spec.rb
+++ b/spec/helpers/navigation_helper_spec.rb
@@ -15,6 +15,10 @@ module Spree
         it "returns :overview for the dashboard" do
           helper.klass_for('dashboard').should == :overview
         end
+
+        it "returns Spree::Order for bulk_order_management" do
+          helper.klass_for('bulk_order_management').should == Spree::Order
+        end
       end
     end
   end