From deb6ecb503a343ae3fb579a5572636889fac2048 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 17 Jul 2019 10:40:12 +0200 Subject: [PATCH 1/8] The parametrized tests are included in Pharo8 --- src/BaselineOfSpec2/BaselineOfSpec2.class.st | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/BaselineOfSpec2/BaselineOfSpec2.class.st b/src/BaselineOfSpec2/BaselineOfSpec2.class.st index 279bedd79..2f1c6167f 100644 --- a/src/BaselineOfSpec2/BaselineOfSpec2.class.st +++ b/src/BaselineOfSpec2/BaselineOfSpec2.class.st @@ -9,8 +9,7 @@ BaselineOfSpec2 >> baseline: spec [ spec for: #common - do: [ "Dependencies" - self parametrizedTests: spec. + do: [ "Packages" spec @@ -61,7 +60,11 @@ BaselineOfSpec2 >> baseline: spec [ spec for: #'pharo7.x' - do: [ self commander2: spec. + do: [ + "Dependencies for Pharo7" + self parametrizedTests: spec. + self commander2: spec. + spec package: 'Spec2-Pharo7To8Compatibility'; package: 'Spec2-Commander2' From a16078d4d0ed5ee0f1c7c5a890bc32e14da26672 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 17 Jul 2019 11:43:09 +0200 Subject: [PATCH 2/8] Fixing the baseline --- src/BaselineOfSpec2/BaselineOfSpec2.class.st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BaselineOfSpec2/BaselineOfSpec2.class.st b/src/BaselineOfSpec2/BaselineOfSpec2.class.st index 2f1c6167f..842a5f689 100644 --- a/src/BaselineOfSpec2/BaselineOfSpec2.class.st +++ b/src/BaselineOfSpec2/BaselineOfSpec2.class.st @@ -52,9 +52,9 @@ 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') ]]. From 407b64dcf0d00c79c1d8bb817dce43406d85f044 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 17 Jul 2019 14:11:35 +0200 Subject: [PATCH 3/8] Adding dependency to ParametrizedTests --- src/BaselineOfSpec2/BaselineOfSpec2.class.st | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/BaselineOfSpec2/BaselineOfSpec2.class.st b/src/BaselineOfSpec2/BaselineOfSpec2.class.st index 842a5f689..bc20b8ffa 100644 --- a/src/BaselineOfSpec2/BaselineOfSpec2.class.st +++ b/src/BaselineOfSpec2/BaselineOfSpec2.class.st @@ -67,6 +67,8 @@ BaselineOfSpec2 >> baseline: spec [ spec package: 'Spec2-Pharo7To8Compatibility'; + package: 'Spec2-Tests' + with: [ spec requires: #('Spec2-Examples' 'ParametrizedTests') ]; package: 'Spec2-Commander2' with: [ spec requires: #('Commander2') ] ]. spec From 45e1cfd0dc1df3c2474e6b04e91012f55ca4035e Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 17 Jul 2019 14:52:06 +0200 Subject: [PATCH 4/8] Ordering dependencies --- src/BaselineOfSpec2/BaselineOfSpec2.class.st | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/BaselineOfSpec2/BaselineOfSpec2.class.st b/src/BaselineOfSpec2/BaselineOfSpec2.class.st index bc20b8ffa..8df608e37 100644 --- a/src/BaselineOfSpec2/BaselineOfSpec2.class.st +++ b/src/BaselineOfSpec2/BaselineOfSpec2.class.st @@ -67,6 +67,8 @@ BaselineOfSpec2 >> baseline: spec [ spec package: 'Spec2-Pharo7To8Compatibility'; + package: 'Spec2-Backend-Tests' + with: [ spec requires: #('ParametrizedTests') ]; package: 'Spec2-Tests' with: [ spec requires: #('Spec2-Examples' 'ParametrizedTests') ]; package: 'Spec2-Commander2' From d51edac432bd9718754654dc2879821a6d224468 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 17 Jul 2019 15:01:10 +0200 Subject: [PATCH 5/8] Fixing dependencies. --- src/BaselineOfSpec2/BaselineOfSpec2.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BaselineOfSpec2/BaselineOfSpec2.class.st b/src/BaselineOfSpec2/BaselineOfSpec2.class.st index 8df608e37..74567e6d2 100644 --- a/src/BaselineOfSpec2/BaselineOfSpec2.class.st +++ b/src/BaselineOfSpec2/BaselineOfSpec2.class.st @@ -68,7 +68,7 @@ BaselineOfSpec2 >> baseline: spec [ spec package: 'Spec2-Pharo7To8Compatibility'; package: 'Spec2-Backend-Tests' - with: [ spec requires: #('ParametrizedTests') ]; + with: [ spec requires: #('ParametrizedTests' 'Spec2-Adapters-Morphic') ]; package: 'Spec2-Tests' with: [ spec requires: #('Spec2-Examples' 'ParametrizedTests') ]; package: 'Spec2-Commander2' From 48d9b9129434e4ba95cd03edf3817bf6ff8bf755 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 17 Jul 2019 15:11:57 +0200 Subject: [PATCH 6/8] Fixing dependencies --- src/BaselineOfSpec2/BaselineOfSpec2.class.st | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/BaselineOfSpec2/BaselineOfSpec2.class.st b/src/BaselineOfSpec2/BaselineOfSpec2.class.st index 74567e6d2..8ae9a5bef 100644 --- a/src/BaselineOfSpec2/BaselineOfSpec2.class.st +++ b/src/BaselineOfSpec2/BaselineOfSpec2.class.st @@ -69,6 +69,8 @@ BaselineOfSpec2 >> baseline: 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' From fd71ee6d2aa30037760ce004ca615ba7673ba373 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 17 Jul 2019 15:30:56 +0200 Subject: [PATCH 7/8] Moving an example of a deprecated class to Deprecated. --- src/Spec2-Deprecated/SpSearchableList.class.st | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Spec2-Deprecated/SpSearchableList.class.st b/src/Spec2-Deprecated/SpSearchableList.class.st index 02a8a8391..d58864f8d 100644 --- 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 [ + + "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." From c841dac2c6c1cabd35726ec15337e3d61d1ddf75 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 17 Jul 2019 15:31:17 +0200 Subject: [PATCH 8/8] Removing Method to deprecated --- src/Spec2-Examples/SpSearchableList.extension.st | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 src/Spec2-Examples/SpSearchableList.extension.st diff --git a/src/Spec2-Examples/SpSearchableList.extension.st b/src/Spec2-Examples/SpSearchableList.extension.st deleted file mode 100644 index 1b90b9d5b..000000000 --- a/src/Spec2-Examples/SpSearchableList.extension.st +++ /dev/null @@ -1,10 +0,0 @@ -Extension { #name : #SpSearchableList } - -{ #category : #'*Spec2-Examples' } -SpSearchableList class >> example [ - - "self example" - - ^ self new - items: #(#aaa #abc #axz #bbb #bfbg #bof #c); openWithSpec -]