Patching more regression issues

This commit is contained in:
Will Marshall
2014-03-27 12:50:39 +11:00
parent 3976694dad
commit b5f1464ce9
2 changed files with 5 additions and 5 deletions

View File

@@ -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

View File

@@ -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