Merge pull request #12931 from AlinT/improve_import_sim

Bug 927886 - Impprove test_import_contacts_from_SIM
mozilla-b2g · Oct 18, 2013 · 383089a · 383089a
2 parents 715e219 + 5e5b9c9
commit 383089a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/tests/python/gaia-ui-tests/gaiatest/apps/contacts/regions/settings_form.py b/tests/python/gaia-ui-tests/gaiatest/apps/contacts/regions/settings_form.py
@@ -48,8 +48,6 @@ def tap_import_from_sim(self):
         self.wait_for_element_displayed(*self._import_from_sim_button_locator)
         self.marionette.find_element(*self._import_from_sim_button_locator).tap()
         self.wait_for_element_not_displayed(*self._loading_overlay_locator)
-        from gaiatest.apps.contacts.app import Contacts
-        return Contacts(self.marionette)
 
     def tap_import_from_sdcard(self):
         self.wait_for_element_displayed(*self._import_from_sdcard_locator)
@@ -70,4 +68,3 @@ def tap_done(self):
     def tap_back_from_import_contacts(self):
         self.wait_for_element_displayed(*self._back_from_import_contacts_locator)
         self.marionette.find_element(*self._back_from_import_contacts_locator).tap()
-
diff --git a/.../python/gaia-ui-tests/gaiatest/tests/functional/contacts/test_import_contacts_from_sim.py b/.../python/gaia-ui-tests/gaiatest/tests/functional/contacts/test_import_contacts_from_sim.py
@@ -23,6 +23,8 @@ def test_import_contacts_from_SIM(self):
         contacts_settings = contacts_app.tap_settings()
         contacts_settings.tap_import_contacts()
         contacts_settings.tap_import_from_sim()
+        contacts_settings.tap_back_from_import_contacts()
+        contacts_settings.tap_done()
 
         # all the contacts in the SIM should be imported
         self.assertEqual(len(contacts_app.contacts), len(self.data_layer.sim_contacts))