Merge pull request #656 from tesonep/fixingBaseline

Making Spec2 load in Pharo7
pharo-spec · Jul 17, 2019 · 3f3ac6d · 3f3ac6d
2 parents 25aa8ed + c841dac
commit 3f3ac6d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/src/BaselineOfSpec2/BaselineOfSpec2.class.st b/src/BaselineOfSpec2/BaselineOfSpec2.class.st
@@ -9,8 +9,7 @@ BaselineOfSpec2 >> baseline: spec [
 	<baseline>
 	spec
 		for: #common
-		do: [ "Dependencies"
-			self parametrizedTests: spec.
+		do: [ 
 
 			"Packages"
 			spec
@@ -53,17 +52,27 @@ BaselineOfSpec2 >> baseline: spec [
 				package: 'Spec2-PolyWidgets-Tests'
 					with: [ spec requires: #('Spec2-Tests' 'Spec2-PolyWidgets') ];
 				package: 'Spec2-Morphic-Backend-Tests'
-					with: [ spec requires: #('Spec2-Adapters-Morphic' 'ParametrizedTests') ];
+					with: [ spec requires: #('Spec2-Adapters-Morphic') ];
 				package: 'Spec2-Backend-Tests'
-					with: [ spec requires: #('Spec2-Adapters-Morphic' 'ParametrizedTests') ];
+					with: [ spec requires: #('Spec2-Adapters-Morphic') ];
 				package: 'Spec2-Compatibility-Tests'
 					with: [ spec requires: #('Spec2-Morphic-Backend-Tests' 'Spec2-Deprecated') ]].
 
 	spec
 		for: #'pharo7.x'
-		do: [ self commander2: spec.
+		do: [ 
+			"Dependencies for Pharo7"
+			self parametrizedTests: spec.			
+			self commander2: spec.
+
 			spec
 				package: 'Spec2-Pharo7To8Compatibility';
+				package: 'Spec2-Backend-Tests'
+					with: [ spec requires: #('ParametrizedTests' 'Spec2-Adapters-Morphic') ];
+				package: 'Spec2-Morphic-Backend-Tests'	
+					with: [ spec requires: #('ParametrizedTests' 'Spec2-Adapters-Morphic') ];
+				package: 'Spec2-Tests'
+					with: [ spec requires: #('Spec2-Examples' 'ParametrizedTests') ];
 				package: 'Spec2-Commander2'
 					with: [ spec requires: #('Commander2') ] ].
 	spec

diff --git a/src/Spec2-Deprecated/SpSearchableList.class.st b/src/Spec2-Deprecated/SpSearchableList.class.st
@@ -27,6 +27,15 @@ SpSearchableList class >> defaultSpec [
 		yourself
 ]
 
+{ #category : #examples }
+SpSearchableList class >> example [
+	<sampleInstance>
+	"self example"
+
+	^ self new
+		items: #(#aaa #abc #axz #bbb #bfbg #bof #c); openWithSpec
+]
+
 { #category : #deprecation }
 SpSearchableList class >> isDeprecated [
 	"Now lists have a filter integrated in them."

diff --git a/src/Spec2-Examples/SpSearchableList.extension.st b/src/Spec2-Examples/SpSearchableList.extension.st