Commit e28cdc7d6b63ef1024f6251472d5c20725ab38b5
Committed by
Daniela Feitosa
1 parent
937b2caf
Exists in
staging
and in
42 other branches
Revert "Changing friends online to friends in chat"
This reverts commit bf661b69c99feebc5616149ae6a29052c12fef60. (ActionItem1959)
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
app/views/layouts/chat.rhtml
@@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
26 | </head> | 26 | </head> |
27 | <body id='chat'> | 27 | <body id='chat'> |
28 | <div id='title-bar'> | 28 | <div id='title-bar'> |
29 | - <h1 class='title'><%= _("%s - Friends in chat (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1> | 29 | + <h1 class='title'><%= _("%s - Friends online (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1> |
30 | </div> | 30 | </div> |
31 | <div id='buddy-list'> | 31 | <div id='buddy-list'> |
32 | <div id='environment-logo'> | 32 | <div id='environment-logo'> |
features/chat.feature
@@ -64,7 +64,7 @@ Feature: chat | @@ -64,7 +64,7 @@ Feature: chat | ||
64 | And I am logged in as "tame" | 64 | And I am logged in as "tame" |
65 | When I follow "Open chat" | 65 | When I follow "Open chat" |
66 | And I select window "noosfero_chat" | 66 | And I select window "noosfero_chat" |
67 | - Then I should see "Chat - Colivre.net - Friends in chat (0)" | 67 | + Then I should see "Chat - Colivre.net - Friends online (0)" |
68 | 68 | ||
69 | @selenium | 69 | @selenium |
70 | Scenario: open chat with an online user in a new window | 70 | Scenario: open chat with an online user in a new window |
@@ -75,7 +75,7 @@ Feature: chat | @@ -75,7 +75,7 @@ Feature: chat | ||
75 | When I click "#chat-online-users-title" | 75 | When I click "#chat-online-users-title" |
76 | And I follow "Maria Silva" | 76 | And I follow "Maria Silva" |
77 | And I select window "noosfero_chat" | 77 | And I select window "noosfero_chat" |
78 | - Then I should see "Chat - Colivre.net - Friends in chat (0)" | 78 | + Then I should see "Chat - Colivre.net - Friends online (0)" |
79 | 79 | ||
80 | @selenium | 80 | @selenium |
81 | Scenario: chat starts disconnected by default | 81 | Scenario: chat starts disconnected by default |
@@ -141,4 +141,4 @@ Feature: chat | @@ -141,4 +141,4 @@ Feature: chat | ||
141 | When I go to Autoramas's profile | 141 | When I go to Autoramas's profile |
142 | And I follow "Enter chat room" | 142 | And I follow "Enter chat room" |
143 | And I select window "noosfero_chat" | 143 | And I select window "noosfero_chat" |
144 | - Then I should see "Chat - Colivre.net - Friends in chat (0)" | 144 | + Then I should see "Chat - Colivre.net - Friends online (0)" |