Merge pull request #64 from ba-st/allowed_failures_ci

Allow to fail Pharo 7
ba-st · Aug 3, 2017 · 5a56a80 · 5a56a80
2 parents b8a2f73 + ba5531c
commit 5a56a80
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,5 @@ os:
 
 # Select compatible Smalltalk image(s)
 smalltalk:
-  - Pharo-7.0
   - Pharo-6.0
   - Pharo-5.0
-
diff --git a/...s/instance/testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter.st b/...s/instance/testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter.st
@@ -3,16 +3,12 @@ testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter
 
 	| command |
 
-	command := DelayedCommand
-		withBehaviorDeterminedBy: [ :response :parameter | 'Test is <1s>' expandMacrosWith: parameter ]
-		with: 'complete'.
+	command := DelayedCommand withBehaviorDeterminedBy: [ :response :parameter | 'Test is <1s>' expandMacrosWith: parameter ] with: 'complete'.
 
 	self
 		should: [ command clientIndependentActions collect: #value ]
 		raise: AssertionFailed
-		withDescription: 'Missing Server Side Parameter'.
+		withExceptionDo: [ :error | self assert: error messageText equals: 'Missing Server Side Parameter' ].
 
 	command priorityActions do: [ :action | action value: self value: 'canvas' ].
-	self
-		assertCollection: (command clientIndependentActions collect: #value)
-		equals: #('Test is complete')
+	self assertCollection: (command clientIndependentActions collect: #value) equals: #('Test is complete')
diff --git a/source/Willow-Tests.package/DelayedCommandTest.class/methodProperties.json b/source/Willow-Tests.package/DelayedCommandTest.class/methodProperties.json
@@ -3,7 +3,7 @@
 		"bePost" : "MaximilianoTabacman 8/1/2017 10:27",
 		"testRequiresSerialization" : "MaximilianoTabacman 8/1/2017 09:33",
 		"testServerIndependentActions" : "MaximilianoTabacman 8/1/2017 09:44",
-		"testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter" : "MaximilianoTabacman 8/1/2017 10:27",
+		"testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter" : "GabrielOmarCotelli 8/3/2017 16:23",
 		"testPriorityActions" : "MaximilianoTabacman 8/1/2017 10:28",
 		"callback:json:" : "MaximilianoTabacman 8/1/2017 10:27",
 		"testModelLoadingActions" : "MaximilianoTabacman 8/1/2017 10:38",

diff --git a/...s/instance/testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter.st b/...s/instance/testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter.st
@@ -3,16 +3,12 @@ testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter
 
 	| command |
 
-	command := EvaluatingCommand
-		for: [ :parameter | 'Test is <1s>' expandMacrosWith: parameter ]
-		with: 'complete'.
+	command := EvaluatingCommand for: [ :parameter | 'Test is <1s>' expandMacrosWith: parameter ] with: 'complete'.
 
 	self
 		should: [ command clientIndependentActions collect: #value ]
 		raise: AssertionFailed
-		withDescription: 'Missing Server Side Parameter'.
+		withExceptionDo: [ :error | self assert: error messageText equals: 'Missing Server Side Parameter' ].
 
 	command priorityActions do: [ :action | action value: self value: 'canvas' ].
-	self
-		assertCollection: (command clientIndependentActions collect: #value)
-		equals: #('Test is complete')
+	self assertCollection: (command clientIndependentActions collect: #value) equals: #('Test is complete')
diff --git a/source/Willow-Tests.package/EvaluatingCommandTest.class/methodProperties.json b/source/Willow-Tests.package/EvaluatingCommandTest.class/methodProperties.json
@@ -3,7 +3,7 @@
 		"bePost" : "MaximilianoTabacman 8/1/2017 10:27",
 		"testRequiresSerialization" : "MaximilianoTabacman 8/1/2017 08:25",
 		"testServerIndependentActions" : "MaximilianoTabacman 8/1/2017 08:37",
-		"testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter" : "MaximilianoTabacman 8/1/2017 08:36",
+		"testClientIndependentActionsDependOnPriorityActionsWhenUsingClientParameter" : "GabrielOmarCotelli 8/3/2017 16:23",
 		"testPriorityActions" : "MaximilianoTabacman 8/1/2017 08:56",
 		"callback:json:" : "MaximilianoTabacman 8/1/2017 08:39",
 		"testModelLoadingActions" : "MaximilianoTabacman 8/1/2017 08:36",

diff --git a/source/Willow-Tests.package/WillowFileTestingPlatform.class/instance/semaphoreClass.st b/source/Willow-Tests.package/WillowFileTestingPlatform.class/instance/semaphoreClass.st
@@ -0,0 +1,4 @@
+factory
+semaphoreClass
+
+	^ platform semaphoreClass
diff --git a/source/Willow-Tests.package/WillowFileTestingPlatform.class/methodProperties.json b/source/Willow-Tests.package/WillowFileTestingPlatform.class/methodProperties.json
@@ -3,6 +3,7 @@
 		"ensureExistenceOfFolder:" : "GabrielOmarCotelli 7/3/2017 14:53",
 		"write:toFile:inFolder:" : "GabrielOmarCotelli 7/3/2017 14:55",
 		"cometWait" : "GabrielOmarCotelli 7/3/2017 14:43",
+		"semaphoreClass" : "GabrielOmarCotelli 8/3/2017 16:17",
 		"initializeWrapping:" : "GabrielOmarCotelli 7/4/2017 11:10",
 		"createdFiles" : "GabrielOmarCotelli 7/3/2017 14:52",
 		"createdFolders" : "GabrielOmarCotelli 7/4/2017 11:12",

diff --git a/source/Willow-Tests.package/monticello.meta/version b/source/Willow-Tests.package/monticello.meta/version
diff --git a/source/Willow.package/WillowNamespaceFileMetadataLibrary.class/instance/nonFileSelectors.st b/source/Willow.package/WillowNamespaceFileMetadataLibrary.class/instance/nonFileSelectors.st
@@ -1,9 +1,7 @@
 Accessing
 nonFileSelectors
 
-	^OrderedCollection new
+	^ OrderedCollection new
 		addAll: super nonFileSelectors;
-		add: #globalWillowNamespaceDeclaration;
-		add: #setUpWillowGlobalNamespace;
-		add: #willowNamespace;
+		addAll: #(globalWillowNamespaceDeclaration setUpWillowGlobalNamespace willowNamespace defaultHandleAjaxErrorCallFunction sessionInformation willowDefaults callServerFunction);
 		yourself
diff --git a/source/Willow.package/WillowNamespaceFileMetadataLibrary.class/methodProperties.json b/source/Willow.package/WillowNamespaceFileMetadataLibrary.class/methodProperties.json
@@ -10,7 +10,7 @@
 		"setUpWillowGlobalNamespace" : "MaximilianoTabacman 8/1/2017 19:55",
 		"selectorsToInclude" : "GabrielOmarCotelli 4/19/2017 14:17",
 		"jswillowJsContent" : "GabrielOmarCotelli 5/9/2017 14:50",
-		"nonFileSelectors" : "MaximilianoTabacman 5/18/2017 21:32",
+		"nonFileSelectors" : "GabrielOmarCotelli 8/3/2017 16:15",
 		"globalWillowNamespaceDeclaration" : "GabrielOmarCotelli 5/9/2017 14:52"
 	},
 	"class" : {

diff --git a/source/Willow.package/monticello.meta/version b/source/Willow.package/monticello.meta/version