From b5f1464ce95fee745bd3cf966a18dba8268b637b Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 27 Mar 2014 12:50:39 +1100 Subject: [PATCH] Patching more regression issues --- .../darkswarm/controllers/tabs_controller.js.coffee | 6 +++++- spec/features/consumer/shopping/shopping_spec.rb | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee index cb1abb71ff..f6e6d15f89 100644 --- a/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee @@ -1,6 +1,10 @@ Darkswarm.controller "TabsCtrl", ($scope, $rootScope, $location, OrderCycle) -> $scope.active = (path)-> - $location.hash() == path + if !OrderCycle.selected() and $location.hash() == "" and path == "/about" + true + else + $location.hash() == path + $scope.tabs = ["contact", "about", "groups", "producers"] for tab in $scope.tabs diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb index 51d18477ad..1b3f7b613c 100644 --- a/spec/features/consumer/shopping/shopping_spec.rb +++ b/spec/features/consumer/shopping/shopping_spec.rb @@ -68,10 +68,6 @@ feature "As a consumer I want to shop with a distributor", js: true do page.should have_selector "option", text: 'turtles' end - it "shows the About Us by default if no order cycle is selected" do - page.should have_content "Hello, world!" - end - it "doesn't show the table before an order cycle is selected" do page.should_not have_selector("input.button.right", visible: true) end