From e87d93c82077a6574df150fc7ad184e847a01ade Mon Sep 17 00:00:00 2001 From: Anton Danchenko Date: Tue, 19 Mar 2019 14:35:15 +0200 Subject: [PATCH] open dapp fix Signed-off-by: Serhy --- test/appium/tests/atomic/chats/test_one_to_one.py | 3 ++- .../tests/atomic/dapps_and_browsing/test_browsing.py | 11 +++++------ test/appium/views/base_view.py | 4 ++++ test/appium/views/home_view.py | 11 +++-------- 4 files changed, 14 insertions(+), 15 deletions(-) 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 678f9dedbd..661995e1e4 100644 --- a/test/appium/tests/atomic/chats/test_one_to_one.py +++ b/test/appium/tests/atomic/chats/test_one_to_one.py @@ -205,7 +205,8 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase): except TimeoutException: self.errors.append('Device 2: URL was not opened from 1-1 chat') web_view.back_to_home_button.click() - chat_2.get_back_to_home_view() + chat_2.home_button.click() + chat_2.back_button.click() chat_name = ''.join(random.choice(string.ascii_lowercase) for _ in range(7)) home_1.join_public_chat(chat_name) diff --git a/test/appium/tests/atomic/dapps_and_browsing/test_browsing.py b/test/appium/tests/atomic/dapps_and_browsing/test_browsing.py index a0d6684892..5ac72aa730 100644 --- a/test/appium/tests/atomic/dapps_and_browsing/test_browsing.py +++ b/test/appium/tests/atomic/dapps_and_browsing/test_browsing.py @@ -12,7 +12,7 @@ class TestBrowsing(SingleDeviceTestCase): def test_browse_page_with_non_english_text(self): sign_in = SignInView(self.driver) home_view = sign_in.create_user() - start_new_chat = home_view.plus_button.click() + start_new_chat = home_view.dapp_tab_button.click() browsing_view = start_new_chat.open_url('www.wikipedia.org') wiki_texts = ['Español', '日本語', 'Français', '中文', 'Português'] for wiki_text in wiki_texts: @@ -23,7 +23,7 @@ class TestBrowsing(SingleDeviceTestCase): def test_open_invalid_link(self): sign_in = SignInView(self.driver) home_view = sign_in.create_user() - start_new_chat = home_view.plus_button.click() + start_new_chat = home_view.dapp_tab_button.click() browsing_view = start_new_chat.open_url('invalid.takoe') browsing_view.find_text_part('Unable to load page') browsing_view.cross_icon.click() @@ -35,7 +35,7 @@ class TestBrowsing(SingleDeviceTestCase): def test_connection_is_not_secure(self): sign_in = SignInView(self.driver) home_view = sign_in.create_user() - start_new_chat = home_view.plus_button.click() + start_new_chat = home_view.dapp_tab_button.click() browsing_view = start_new_chat.open_url('http://www.dvwa.co.uk') browsing_view.url_edit_box_lock_icon.click() browsing_view.find_full_text(connection_not_secure_text) @@ -45,7 +45,7 @@ class TestBrowsing(SingleDeviceTestCase): def test_connection_is_secure(self): sign_in = SignInView(self.driver) home_view = sign_in.create_user() - start_new_chat = home_view.plus_button.click() + start_new_chat = home_view.dapp_tab_button.click() browsing_view = start_new_chat.open_url('https://www.bbc.com') browsing_view.url_edit_box_lock_icon.click() browsing_view.find_full_text(connection_is_secure_text) @@ -59,11 +59,10 @@ class TestBrowsing(SingleDeviceTestCase): @marks.testrail_id(5390) @marks.high - ### TO DO: this needs to be updated. Feature changed in PR-7719 def test_swipe_to_delete_browser_entry(self): sign_in = SignInView(self.driver) home_view = sign_in.create_user() - start_new_chat = home_view.plus_button.click() + start_new_chat = home_view.dapp_tab_button.click() browsing_view = start_new_chat.open_url('google.com') browsing_view.cross_icon.click() browser_entry = home_view.get_chat_with_user('Google') diff --git a/test/appium/views/base_view.py b/test/appium/views/base_view.py index 0b49f6c002..51a60b7e49 100644 --- a/test/appium/views/base_view.py +++ b/test/appium/views/base_view.py @@ -446,6 +446,10 @@ class BaseView(object): def swipe_down(self): self.driver.swipe(500, 500, 500, 1000) + def get_status_test_dapp_view(self): + from views.web_views.status_test_dapp import StatusTestDAppView + return StatusTestDAppView(self.driver) + def get_home_view(self): from views.home_view import HomeView return HomeView(self.driver) diff --git a/test/appium/views/home_view.py b/test/appium/views/home_view.py index e0b6f328cf..4f338d2d9c 100644 --- a/test/appium/views/home_view.py +++ b/test/appium/views/home_view.py @@ -166,14 +166,9 @@ class HomeView(BaseView): return chat_view def open_status_test_dapp(self, allow_all=True): - profile_view = self.profile_button.click() - profile_view.advanced_button.click() - profile_view.debug_mode_toggle.click() - dapp_view = profile_view.dapp_tab_button.click() - #dapp_view.open_d_app_button.click() - dapp_view.status_test_dapp_button.scroll_to_element(15) - status_test_dapp = dapp_view.status_test_dapp_button.click() - #dapp_view.open_button.click() + dapp_view = self.dapp_tab_button.click() + dapp_view.open_url('simpledapp.eth') + status_test_dapp = dapp_view.get_status_test_dapp_view() for _ in range(2): if allow_all: status_test_dapp.allow_button.click()