From 72118f4e2efcef07750ac793f7a75d9e968e02a5 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 19 Dec 2014 10:01:46 +1100 Subject: [PATCH] Fix syntax error, spec for removed column --- app/controllers/spree/admin/reports_controller_decorator.rb | 2 +- spec/features/admin/reports_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 6da368eff1..b346c45b67 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -638,7 +638,7 @@ Spree::Admin::ReportsController.class_eval do :customers => {:name => "Customers", :description => 'Customer details'}, :products_and_inventory => {:name => "Products & Inventory", :description => ''}, :sales_total => { :name => "Sales Total", :description => "Sales Total For All Orders" }, - :users_and_enterprises => { :name => "Users & Enterprises", :description => "Enterprise Ownership & Status" } + :users_and_enterprises => { :name => "Users & Enterprises", :description => "Enterprise Ownership & Status" }, :order_cycle_management => {:name => "Order Cycle Management", :description => ''} } # Return only reports the user is authorized to view. diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb index 298086c2e4..0524a6769e 100644 --- a/spec/features/admin/reports_spec.rb +++ b/spec/features/admin/reports_spec.rb @@ -70,7 +70,7 @@ feature %q{ rows = find("table#listing_order_payment_methods").all("thead tr") table = rows.map { |r| r.all("th").map { |c| c.text.strip } } table.sort.should == [ - ["First Name", "Last Name", "Email", "Phone", "Hub", "Shipping Method", "Payment Method", "Amount", "Amount Paid"] + ["First Name", "Last Name", "Email", "Phone", "Hub", "Shipping Method", "Payment Method", "Amount"] ].sort end end