Merge remote-tracking branch 'origin/develop-8.1' into merge-develop-8.1_17.10.2016

livecodepanos · livecodepanos · commit 3b0f2360ad28 · 2016-10-17T13:30:17.000+01:00
diff --git a/tests/core/idelibrary/stackedited.livecodescript b/tests/core/idelibrary/stackedited.livecodescript
@@ -67,7 +67,7 @@ on TestStackNameChangedEdited
    TestAssert "Stack with name change is marked edited", revIDEStackIsEdited("TestStackNewName")
 end TestStackNameChangedEdited
 
-on TestStackOpenFieldEdited
+on TestStackOpenFieldEdited   
    local tStackName
    create stack
    put the short name of it into tStackName
@@ -78,9 +78,7 @@ on TestStackOpenFieldEdited
    put it into tFieldID
    revIDESetUnedited tStackName
    
-   -- Simulate openField
-   choose browse tool
-   click at the loc of tFieldID
+   dispatch "openField" to tFieldID
     
    TestAssert "Stack with opened field is marked edited", revIDEStackIsEdited(tStackName)
 end TestStackOpenFieldEdited
diff --git a/tests/core/objectprops/objectdefaultprops.livecodescript b/tests/core/objectprops/objectdefaultprops.livecodescript
@@ -1718,6 +1718,11 @@ end TestImageDefaultProps
 
 
 on TestPlayerDefaultProps
+   if the platform is "linux" then
+      TestSkip "player property tests", "Bug 18618"
+      exit TestPlayerDefaultProps
+   end if
+	
    local tObjectID
    revIDEActionCreateObject "com.livecode.interface.classic.Player"
    put the result into tObjectID
