Merge branch 'pending-moredip-commits' into remove-uiautomation-in-ios7

TestingWithFrank · Jan 20, 2016 · b494e83 · b494e83
2 parents 77f4731 + 933997d
commit b494e83
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/gem/lib/frank-cucumber/core_frank_steps.rb b/gem/lib/frank-cucumber/core_frank_steps.rb
@@ -66,7 +66,11 @@
 end
 
 Then /^I should see an alert view titled "([^\"]*)"$/ do |expected_mark|
-  values = frankly_map( 'alertView', 'title')
+  if frankly_os_version.to_f >= 7.0
+    values = frankly_map( "view:'_UIModalItemRepresentationView' label", 'text')
+  else
+    values = frankly_map( 'alertView', 'title')
+  end
   values.should include(expected_mark)
 end
 
@@ -76,7 +80,11 @@
 end
 
 Then /^I should not see an alert view$/ do
-  check_element_does_not_exist( 'alertView' )
+  if frankly_os_version.to_f >= 7.0
+    check_element_does_not_exist( '_UIModalItemRepresentationView' ) 
+  else
+    check_element_does_not_exist( 'alertView' )
+  end
 end
 
 Then /^I should see an element of class "([^\"]*)" with name "([^\"]*)" with the following labels: "([^\"]*)"$/ do |className, classLabel, listOfLabels|

diff --git a/src/OrientationCommand.m b/src/OrientationCommand.m
@@ -83,7 +83,7 @@ - (NSString *)getOrientationDescriptionViaDevice{
 - (NSString *)handleGet{
    	NSDictionary *orientationDescription = [self getOrientationRepresentationViaDevice];
     if( !orientationDescription )
-        orientationDescription = [self getOrientationRepresentationViaDevice];
+        orientationDescription = [self getOrientationRepresentationViaStatusBar];
 
 	return TO_JSON(orientationDescription);
 }