@@ -7,6 +7,7 @@ class Xmpp.Views.Tabbar.TabView extends Backbone.View

   events:

     'click .js-close': 'closeChat'

+    'click a div': 'switchChatWindow'

   initialize: () ->

     _.bindAll(this)

@@ -54,3 +55,6 @@ class Xmpp.Views.Tabbar.TabView extends Backbone.View

   hasParticipants: (who, withWhom) ->

     @model && @model.get('who') == who && @model.get('withWhom') == withWhom

+

+  switchChatWindow: ->

+    Backbone.Events.trigger('openChat', @model)

\ No newline at end of file

@@ -15,7 +15,7 @@ casper.then(->

   inactiveListLengthAfter = @inactiveListLength()

   @test.assertExists('#conversation-js', 'Conversation window created')

-  @test.assertExists('#tabbar .tab.active', 'Created new tab in the tabbar')

+  @test.assertExists('#js-tabbar .tab.active', 'Created new tab in the tabbar')

   @test.assert(inactiveListLengthBefore - 1 == inactiveListLengthAfter, 'User isn\'t in the inactive list')

   @test.assertExists('#js-active-friends ul li', 'User is in the active list')

 )

@@ -38,13 +38,23 @@ casper.then(->

   @test.assert(inactiveListLengthBefore == inactiveListLengthAfter, 'Users from the active and the inactive list swapped')

 )

+#Test tab switching behaviour

+casper.then(->

+  for i in [1..2]

+    @click("#js-tabbar .tab:nth-child(#{i}) a div")

+    isActive = @evaluate((i)->

+      __utils__.exists("#js-tabbar .tab:nth-child(#{i}).active")

+    , i)

+    @test.assert(isActive, 'Clicked tab is active')

+)

+

 #Test tab closing behaviour

 casper.then(->

-  @click('#tabbar .tab.active .js-close')

+  @click('#js-tabbar .tab.active .js-close')

   @echo 'Closed active tab'

-  @test.assertExists('#tabbar .tab.active', 'There\'s another active tab')

-  @click('#tabbar .tab.active .js-close')

+  @test.assertExists('#js-tabbar .tab.active', 'There\'s another active tab')

+  @click('#js-tabbar .tab.active .js-close')

   @echo 'Closed another active tab'

   tabsLength = @tabsLength()

@@ -28,6 +28,6 @@ casper.activeListLength = ->

   casper.evaluate(-> __utils__.findAll('#js-active-friends ul li').length)

 casper.tabsLength = ->

-  casper.evaluate(-> __utils__.findAll('#tabbar .tab').length)

+  casper.evaluate(-> __utils__.findAll('#js-tabbar .tab').length)

 exports.Fantomas = casper

\ No newline at end of file