Merge 62f48a9 into a0224a0

PharoJS · Jul 14, 2023 · 366cc58 · 366cc58
2 parents a0224a0 + 62f48a9
commit 366cc58
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches: [ "pharo10", "ci" ]
   pull_request:
-    branches: [ "pharo10" ]
+    branches: [ "pharo10", "ci" ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -6,7 +6,7 @@ SmalltalkCISpec {
       #platforms : [ #pharo ]
     }
   ],
-  #postLoading : [
+  #preTesting : [
     'scripts/setup.st'
   ],
   #testing : { 

diff --git a/Pharo/PharoJs-Base-Bridge-Tests/PjBridgeTestCase.class.st b/Pharo/PharoJs-Base-Bridge-Tests/PjBridgeTestCase.class.st
@@ -31,6 +31,12 @@ PjBridgeTestCase class >> appClass [
 	^ PjMinimalWebApplication
 ]
 
+{ #category : #'suite parameters' }
+PjBridgeTestCase class >> defaultTimeLimit [
+
+	^ 2 minutes
+]
+
 { #category : #'test support' }
 PjBridgeTestCase >> addToDOM: html [
 

diff --git a/Pharo/PharoJs-Base-Bridge-Tests/PjLoadForTest.class.st b/Pharo/PharoJs-Base-Bridge-Tests/PjLoadForTest.class.st
@@ -57,9 +57,8 @@ PjLoadForTest class >> y [
 ]
 
 { #category : #any }
-PjLoadForTest >> literal [
+PjLoadForTest >> literalGenerator [
 	<jsLiteralGenerator>
-
 	^ 3 + 4
 ]
 

diff --git a/Pharo/PharoJs-Base-Bridge-Tests/PjLoadingTest.class.st b/Pharo/PharoJs-Base-Bridge-Tests/PjLoadingTest.class.st
@@ -49,7 +49,7 @@ PjLoadingTest >> testEvalBlock [
 PjLoadingTest >> testLiteralGeneration [
 
 	self assertEquivalent: [ PjLoadForTest literal ].
-	self assertEquivalent: [ PjLoadForTest new literal ]
+	self assertEquivalent: [ PjLoadForTest new literalGenerator ]
 ]
 
 { #category : #tests }

diff --git a/Pharo/PharoJs-TestFramework/PjAppTestCase.class.st b/Pharo/PharoJs-TestFramework/PjAppTestCase.class.st
@@ -140,5 +140,5 @@ PjAppTestCase >> tearDown [
 
 { #category : #testing }
 PjAppTestCase >> timeOutForAppStartUp [
-	^3 seconds
+	^ 20 seconds
 ]
diff --git a/scripts/setup.st b/scripts/setup.st
@@ -4,4 +4,5 @@ newRepository := IceRepositoryCreator new
 				repository: nil;
 				location: '.' asFileReference ;
 				createRepository .
-newRepository register.
+newRepository register.
+WebBrowser webbrowserClassForPlatform openNativeWebBrowserOn: 'https://google.com'.