From 39d0202d7ac5b821f46f3eaeb802dfcce5ca89e7 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 5 Apr 2013 18:09:00 +0200
Subject: [PATCH] Fix specs, add styling for firefox

---
 assets/scripts/app/views/application.coffee   |  2 +-
 assets/scripts/app/views/repo/show.coffee     |  3 +--
 assets/scripts/app/views/sidebar.coffee       |  1 +
 assets/scripts/spec/event_spec.coffee         | 10 ++++++++--
 assets/scripts/spec/support/conditions.coffee |  1 +
 assets/styles/right.sass                      |  1 +
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/assets/scripts/app/views/application.coffee b/assets/scripts/app/views/application.coffee
index 54f18c30..45d414e0 100644
--- a/assets/scripts/app/views/application.coffee
+++ b/assets/scripts/app/views/application.coffee
@@ -7,7 +7,7 @@ Travis.reopen
       @rerender()
     ).observes('templateName')
 
-    click: ->
+    click: (event) ->
       # TODO: this solves the case of closing menus and popups,
       #       but I would like to rewrite it later, not sure how
       #       yet, but this does not seem optimal
diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee
index 0c0e317d..db7ae25e 100644
--- a/assets/scripts/app/views/repo/show.coffee
+++ b/assets/scripts/app/views/repo/show.coffee
@@ -64,10 +64,9 @@ Travis.reopen
     currentUserBinding: 'controller.currentUser'
 
     closeMenu: ->
-      console.log 'closeMenu'
       $('.menu').removeClass('display')
 
-    menu: ->
+    menu: (event) ->
       @popupCloseAll()
       $('#tools .menu').toggleClass('display')
       event.stopPropagation()
diff --git a/assets/scripts/app/views/sidebar.coffee b/assets/scripts/app/views/sidebar.coffee
index b9401d5b..35103343 100644
--- a/assets/scripts/app/views/sidebar.coffee
+++ b/assets/scripts/app/views/sidebar.coffee
@@ -8,6 +8,7 @@
       @activate('jobs')
 
     activate: (name) ->
+      return if @get('activeTab') == name
       @set('activeTab', name)
       @connectOutlet 'pane', @["#{name.capitalize()}View"].create(controller: @get('controller'))
 
diff --git a/assets/scripts/spec/event_spec.coffee b/assets/scripts/spec/event_spec.coffee
index ddde0844..f867f868 100644
--- a/assets/scripts/spec/event_spec.coffee
+++ b/assets/scripts/spec/event_spec.coffee
@@ -121,7 +121,10 @@ describe 'events', ->
   describe 'an event adding a worker', ->
     beforeEach ->
       app ''
-      waitFor workersRendered
+      waitFor sidebarTabsRendered
+      runs ->
+        $('#right #tab_workers a').trigger('click')
+        waitFor workersRendered
 
     it 'adds a worker to the workers list', ->
       payload =
@@ -155,7 +158,10 @@ describe 'events', ->
   describe 'an event updating a worker', ->
     beforeEach ->
       app '/travis-ci/travis-core'
-      waitFor workersRendered
+      waitFor sidebarTabsRendered
+      runs ->
+        $('#right #tab_workers a').trigger('click')
+        waitFor workersRendered
 
     it 'does not update repository if it\'s already in the store', ->
       payload =
diff --git a/assets/scripts/spec/support/conditions.coffee b/assets/scripts/spec/support/conditions.coffee
index 67a60462..934cada6 100644
--- a/assets/scripts/spec/support/conditions.coffee
+++ b/assets/scripts/spec/support/conditions.coffee
@@ -12,3 +12,4 @@
 @queuesRendered  = notEmpty('#queue_linux li')
 @workersRendered = notEmpty('.worker')
 
+@sidebarTabsRendered = notEmpty('#right #tab_workers a')
diff --git a/assets/styles/right.sass b/assets/styles/right.sass
index 8150aae6..4d40b06d 100644
--- a/assets/styles/right.sass
+++ b/assets/styles/right.sass
@@ -57,5 +57,6 @@
     white-space: nowrap
     text-overflow: ellipsis
     display: inline-block
+    display: -moz-inline-stack
   .group a
     cursor: pointer