diff --git a/app/controllers/spree/store_controller_decorator.rb b/app/controllers/spree/store_controller_decorator.rb new file mode 100644 index 0000000000..09c2efc7b4 --- /dev/null +++ b/app/controllers/spree/store_controller_decorator.rb @@ -0,0 +1,7 @@ +class Spree::StoreController + layout 'darkswarm' + + def unauthorized + render 'shared/unauthorized', :status => 401 + end +end diff --git a/app/views/shared/unauthorized.html.haml b/app/views/shared/unauthorized.html.haml new file mode 100644 index 0000000000..fcf3f3bf27 --- /dev/null +++ b/app/views/shared/unauthorized.html.haml @@ -0,0 +1 @@ +Unauthorized diff --git a/spec/controllers/spree/store_controller_spec.rb b/spec/controllers/spree/store_controller_spec.rb new file mode 100644 index 0000000000..e1b94de185 --- /dev/null +++ b/spec/controllers/spree/store_controller_spec.rb @@ -0,0 +1,14 @@ +require 'spec_helper' + +describe Spree::StoreController do + controller(Spree::StoreController) do + before_filter :unauthorized + def index + render text: "" + end + end + it "redirects to home when unauthorized" do + get :index + response.should render_template("shared/unauthorized", layout: 'darkswarm') + end +end diff --git a/spec/javascripts/unit/darkswarm/services/order_cycle_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/order_cycle_spec.js.coffee index f7a65867e8..93dd7de79c 100644 --- a/spec/javascripts/unit/darkswarm/services/order_cycle_spec.js.coffee +++ b/spec/javascripts/unit/darkswarm/services/order_cycle_spec.js.coffee @@ -21,14 +21,14 @@ describe 'OrderCycle service', -> $httpBackend.expectPOST("/shop/order_cycle", {"order_cycle_id" : 10}).respond(200) spyOn(mockProduct, "update") OrderCycle.order_cycle.order_cycle_id = 10 - OrderCycle.push_order_cycle() + OrderCycle.push_order_cycle mockProduct.update $httpBackend.flush() expect(mockProduct.update).toHaveBeenCalled() it "updates the orders_close_at attr after update", -> datestring = "2013-12-20T00:00:00+11:00" $httpBackend.expectPOST("/shop/order_cycle").respond({orders_close_at: datestring}) - OrderCycle.push_order_cycle() + OrderCycle.push_order_cycle mockProduct.update $httpBackend.flush() expect(OrderCycle.order_cycle.orders_close_at).toEqual(datestring) diff --git a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee index c5df602b3a..4f6c711f99 100644 --- a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee +++ b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee @@ -29,7 +29,6 @@ describe 'Order service', -> inject ($injector, _$httpBackend_)-> $httpBackend = _$httpBackend_ - $httpBackend.expectGET("/shop/products").respond 200, [] Order = $injector.get("Order") Navigation = $injector.get("Navigation") flash = $injector.get("flash")