From 6672400041bab85e319c2e161f49e0f57a8f5a33 Mon Sep 17 00:00:00 2001 From: tbenr Date: Thu, 12 Jul 2018 21:41:50 +0200 Subject: [PATCH] Fixes #4938 Signed-off-by: Julien Eluard --- src/status_im/translations/en.cljs | 2 +- src/status_im/ui/components/list_selection.cljs | 4 ++-- test/appium/tests/atomic/chats/test_one_to_one.py | 4 ++-- test/appium/tests/test_messaging.py | 2 +- test/appium/views/chat_view.py | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/status_im/translations/en.cljs b/src/status_im/translations/en.cljs index 17ab6f5f36..60ccb2113e 100644 --- a/src/status_im/translations/en.cljs +++ b/src/status_im/translations/en.cljs @@ -200,7 +200,7 @@ :browsing-title "Browse" :browsing-open-in-web-browser "Open in web browser" - :browsing-open-in-browser "Open in browser" + :browsing-open-in-status "Open in Status" :browsing-cancel "Cancel" ;;sign-up diff --git a/src/status_im/ui/components/list_selection.cljs b/src/status_im/ui/components/list_selection.cljs index f6a3845505..0aa832e7b7 100644 --- a/src/status_im/ui/components/list_selection.cljs +++ b/src/status_im/ui/components/list_selection.cljs @@ -30,7 +30,7 @@ (defn browse [link] (show {:title (i18n/label :t/browsing-title) - :options [{:label (i18n/label :t/browsing-open-in-browser) + :options [{:label (i18n/label :t/browsing-open-in-status) :action #(re-frame/dispatch [:open-url-in-browser link])} {:label (i18n/label :t/browsing-open-in-web-browser) :action #(.openURL react/linking (http/normalize-url link))}] @@ -38,6 +38,6 @@ (defn browse-dapp [link] (show {:title (i18n/label :t/browsing-title) - :options [{:label (i18n/label :t/browsing-open-in-browser) + :options [{:label (i18n/label :t/browsing-open-in-status) :action #(re-frame/dispatch [:open-url-in-browser link])}] :cancel-text (i18n/label :t/browsing-cancel)})) diff --git a/test/appium/tests/atomic/chats/test_one_to_one.py b/test/appium/tests/atomic/chats/test_one_to_one.py index ce3b6b3085..d4d99e66e8 100644 --- a/test/appium/tests/atomic/chats/test_one_to_one.py +++ b/test/appium/tests/atomic/chats/test_one_to_one.py @@ -244,7 +244,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase): chat_1.get_back_to_home_view() chat_2 = home_2.get_chat_with_user(username_1).click() chat_2.element_starts_with_text(url_message, 'button').click() - web_view = chat_2.open_in_browser_button.click() + web_view = chat_2.open_in_status_button.click() try: web_view.find_full_text('Status, the Ethereum discovery tool.') except TimeoutException: @@ -258,7 +258,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase): chat_2.chat_message_input.send_keys(url_message) chat_2.send_message_button.click() chat_1.element_starts_with_text(url_message, 'button').click() - web_view = chat_1.open_in_browser_button.click() + web_view = chat_1.open_in_status_button.click() try: web_view.find_full_text('Status, the Ethereum discovery tool.') except TimeoutException: diff --git a/test/appium/tests/test_messaging.py b/test/appium/tests/test_messaging.py index 24b2a17c62..61049939a0 100644 --- a/test/appium/tests/test_messaging.py +++ b/test/appium/tests/test_messaging.py @@ -71,7 +71,7 @@ class TestMessages(MultipleDeviceTestCase): device_1_chat.wait_for_message_in_one_to_one_chat(url_message, self.errors) if device_1_chat.element_by_text(url_message, 'button').is_element_present(): device_1_chat.element_by_text(url_message, 'button').click() - web_view = device_1_chat.open_in_browser_button.click() + web_view = device_1_chat.open_in_status_button.click() web_view.find_full_text('Status, the Ethereum discovery tool.') device_1_chat.back_button.click() diff --git a/test/appium/views/chat_view.py b/test/appium/views/chat_view.py index 83c1c47341..c7d6b916c3 100644 --- a/test/appium/views/chat_view.py +++ b/test/appium/views/chat_view.py @@ -129,10 +129,10 @@ class MoreUsersButton(BaseButton): self.locator = self.Locator.xpath_selector("//android.widget.TextView[contains(@text, 'MORE')]") -class OpenInBrowserButton(BaseButton): +class OpenInStatusButton(BaseButton): def __init__(self, driver): - super(OpenInBrowserButton, self).__init__(driver) - self.locator = self.Locator.xpath_selector("//*[@text='Open in browser']") + super(OpenInStatusButton, self).__init__(driver) + self.locator = self.Locator.xpath_selector("//*[@text='Open in Status']") def navigate(self): from views.web_views.base_web_view import BaseWebView @@ -266,7 +266,7 @@ class ChatView(BaseView): self.first_recipient_button = FirstRecipient(self.driver) - self.open_in_browser_button = OpenInBrowserButton(self.driver) + self.open_in_status_button = OpenInStatusButton(self.driver) # Contact's profile self.contact_profile_picture = ProfilePictureElement(self.driver)