Merge remote-tracking branch 'origin/master'

Author: vhristov5555

core/device/simulator.py

@@ -14,8 +14,13 @@
 class Simulator(object):
     @staticmethod
     def __get_sim_location():
-        xcode_location = run(command='xcode-select -p', log_level=CommandLogLevel.SILENT).strip()
-        sim_location = xcode_location + '/Applications/Simulator.app/Contents/MacOS/Simulator'
+        output = run(command='xcrun --show-sdk-path', log_level=CommandLogLevel.SILENT).strip()
+        xcode_location = ''
+        for paths in output.split('/'):
+            xcode_location = xcode_location + paths + '/'
+            if "Xcode" in paths:
+                break
+        sim_location = xcode_location + 'Contents/Developer/Applications/Simulator.app'
         print "Simulator Application: " + sim_location
         return sim_location
 

data/images/Emulator-Api23-Default/template-master-detail-ng_bundle_sync.png

@@ -262,7 +262,7 @@ def test_200_run_android_bundle(self, demo):
         # Verify application looks correct
         Tns.wait_for_log(log_file=log, string_list=Helpers.wp_sync, not_existing_string_list=Helpers.wp_errors,
                          check_interval=5, timeout=120)
-        Helpers.android_screen_match(image=demo + '_bundle_sync')
+        Helpers.android_screen_match(image=demo + '_sync')
 
         # Revert changes
         StarterKitsTests.revert_changes(self=self, demo=demo, platform=Platform.ANDROID, device_id=EMULATOR_ID)
@@ -289,7 +289,7 @@ def test_200_run_ios_bundle(self, demo):
         # Verify application looks correct
         Tns.wait_for_log(log_file=log, string_list=Helpers.wp_sync, not_existing_string_list=Helpers.wp_errors,
                          check_interval=5, timeout=120)
-        Helpers.ios_screen_match(sim_id=self.SIMULATOR_ID, image=demo + '_bundle_sync')
+        Helpers.ios_screen_match(sim_id=self.SIMULATOR_ID, image=demo + '_sync')
 
         # Revert changes
         StarterKitsTests.revert_changes(self=self, demo=demo, platform=Platform.IOS,