Download as
Browse Code »

Commit db309ec716a6cd1dc0b2149455eb055c4b6e1ff6

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent e28cdc7d
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Changing friends online to friends in chat (at right place) 

(ActionItem1959)
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/views/shared/logged_in/xmpp_chat.rhtml
  Diff comments   View file @db309ec
@@ -6,6 +6,6 @@ @@ -6,6 +6,6 @@
6 </div> 6 </div>
7 </div> 7 </div>
8 <a href='#' id='chat-online-users-title' onclick='return false;'> 8 <a href='#' id='chat-online-users-title' onclick='return false;'>
9 - <div class='header'><i class='icon-chat'></i><span><%= _("Online friends <span class='amount_of_friends'>(%{amount})</span>") %></span></div> 9 + <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat <span class='amount_of_friends'>(%{amount})</span>") %></span></div>
10 </a> 10 </a>
11 </div> 11 </div>
features/chat.feature
  Diff comments   View file @db309ec
@@ -23,7 +23,7 @@ Feature: chat @@ -23,7 +23,7 @@ Feature: chat
23 Scenario: provide the chat online users content 23 Scenario: provide the chat online users content
24 Given feature "xmpp_chat" is enabled on environment 24 Given feature "xmpp_chat" is enabled on environment
25 And I am logged in as "tame" 25 And I am logged in as "tame"
26 - Then I should see "Online friends " 26 + Then I should see "Friends in chat "
27 27
28 @selenium 28 @selenium
29 Scenario: provide the chat online users list 29 Scenario: provide the chat online users list
@@ -46,7 +46,7 @@ Feature: chat @@ -46,7 +46,7 @@ Feature: chat
46 @selenium 46 @selenium
47 Scenario: not provide the chat online users list when environment not support that 47 Scenario: not provide the chat online users list when environment not support that
48 Given I am logged in as "tame" 48 Given I am logged in as "tame"
49 - Then I should not see "Online friends " 49 + Then I should not see "Friends in chat "
50 50
51 Scenario: block access to chat when environment not support that 51 Scenario: block access to chat when environment not support that
52 Given I am logged in as "tame" 52 Given I am logged in as "tame"