Merge pull request #9 from ba-st/update-evaluation-affordances

Update evaluation affordances

.github/workflows/build.yml

@@ -7,18 +7,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        smalltalk: [ Pharo64-8.0, Pharo64-7.0, Pharo32-7.0, Pharo32-6.1 ]
+        smalltalk: [ Pharo64-8.0, Pharo64-7.0, Pharo32-7.0 ]
     name: ${{ matrix.smalltalk }}
     steps:
       - uses: actions/checkout@v2
-      - uses: ba-st-actions/setup-smalltalkCI@v1.0.0
+      - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-version: ${{ matrix.smalltalk }}
-      - run: smalltalkci -s ${{ matrix.smalltalk }}
+      - name: Load Image and Run Tests
+        run: smalltalkci -s ${{ matrix.smalltalk }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         timeout-minutes: 15
-      - run: echo "::set-env name=SCI_COVERAGE_FILE_LOCATION::${HOME}/.smalltalkCI/_builds/coveralls_results.json"
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1.0.6
+        uses: codecov/codecov-action@v1
         with:
+          name: ${{matrix.os}}-${{matrix.smalltalk}}
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: ${{ env.SCI_COVERAGE_FILE_LOCATION }}

.github/workflows/loading-groups.yml

@@ -0,0 +1,23 @@
+name: Group loading check
+
+on: [push,pull_request]
+
+jobs:
+   build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        smalltalk: [ Pharo64-8.0, Pharo64-7.0 ]
+        load-spec: [ deployment, dependent-sunit-extensions, tests, tools, development]
+    name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: hpi-swa/setup-smalltalkCI@v1
+        with:
+          smalltalk-version: ${{ matrix.smalltalk }}
+      - name: Load group in image
+        run: smalltalkci -s ${{ matrix.smalltalk }} .loading.${{ matrix.load-spec }}.ston
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        timeout-minutes: 15

.loading.dependent-sunit-extensions.ston

@@ -0,0 +1,13 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowMixpanel',
+      #directory : 'source',
+      #load : [ 'Dependent-SUnit-Extensions' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #failOnZeroTests : false
+  }
+}

.loading.deployment.ston

@@ -0,0 +1,13 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowMixpanel',
+      #directory : 'source',
+      #load : [ 'Deployment' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #failOnZeroTests : false
+  }
+}

.loading.development.ston

@@ -0,0 +1,16 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowMixpanel',
+      #directory : 'source',
+      #load : [ 'Development' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #coverage : {
+      #packages : [ 'Willow-Mixpanel*' ],
+      #format: #lcov
+    }
+  }
+}

.loading.tests.ston

@@ -0,0 +1,16 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowMixpanel',
+      #directory : 'source',
+      #load : [ 'Tests' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #coverage : {
+      #packages : [ 'Willow-Mixpanel*' ],
+      #format: #lcov
+    }
+  }   
+}

.loading.tools.ston

@@ -0,0 +1,13 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowMixpanel',
+      #directory : 'source',
+      #load : [ 'Tools' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #failOnZeroTests : false
+  }
+}

.smalltalk.ston

@@ -9,7 +9,8 @@ SmalltalkCISpec {
   ],
   #testing : {
     #coverage : {
-       #packages : [ 'Willow-Mixpanel*' ]
+       #packages : [ 'Willow-Mixpanel*' ],
+      #format: #lcov
     }
   }
 }

source/BaselineOfWillowMixpanel/BaselineOfWillowMixpanel.class.st

@@ -31,7 +31,7 @@ BaselineOfWillowMixpanel >> projectClass [
 BaselineOfWillowMixpanel >> setUpDependencies: spec [
 
 	spec
-		baseline: 'Willow' with: [ spec repository: 'github://ba-st/Willow:v13/source' ];
+		baseline: 'Willow' with: [ spec repository: 'github://ba-st/Willow:v14/source' ];
 		project: 'Willow-Deployment' copyFrom: 'Willow' with: [ spec loads: 'Deployment' ];
 		project: 'Willow-SUnit' copyFrom: 'Willow' with: [ spec loads: 'Dependent-SUnit-Extensions' ];
 		project: 'Willow-Tools' copyFrom: 'Willow' with: [ spec loads: 'Tools' ]

source/Willow-Mixpanel-Tests/WillowMixpanelInteractionTest.class.st

@@ -9,7 +9,7 @@ WillowMixpanelInteractionTest >> testSendToMixpanel [
 
 	| interpreter html |
 
-	interpreter := WebInteractionInterpreter forClickOnComponent.
+	interpreter := EventInterpreterDispatcher defaultingToClick trigger.
 	interpreter sendToMixpanel: [ :mixpanel | mixpanel track: 'Testing' ].
 	html := self apply: interpreter toComponentDefinedBy: [ :canvas | canvas button ].
 	self

source/Willow-Mixpanel/WebInteractionInterpreterBehavior.extension.st

@@ -4,7 +4,7 @@ Extension { #name : #WebInteractionInterpreterBehavior }
 WebInteractionInterpreterBehavior >> sendToMixpanel: aBlock [
 
 	^ self
-		executeOnClient: [ :canvas | 
+		userAgentDo: [ :canvas | 
 			| mixpanel |
 
 			mixpanel := canvas mixpanel.