Browser: Refactored tests of Fetch

Made unit tests independent of loaded HTML page. Moved browser dependent tests to Browser project. Updated npm packages.
Small-JS · Jun 22, 2024 · e5131bd · e5131bd
1 parent 73c0e8e
commit e5131bd
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 55 deletions.
diff --git a/Smalltalk/Browser/Fetch/Test/TestFetch.st → Browser/src/Test/TestFetch.st b/Smalltalk/Browser/Fetch/Test/TestFetch.st → Browser/src/Test/TestFetch.st
@@ -1,11 +1,11 @@
 CLASS TestFetch EXTENDS Test MODULE TestBrowser CLASSVARS '' VARS ''
 
 test
-	Fetch text: 'Test/MyObject.json'
+	Fetch text: 'MyObject.json'
 		then: [ :string | self onFetchFile: string ]
 		catch: [ :error | error throw ].
 
-	Fetch object: 'Test/MyObject.json'
+	Fetch object: 'MyObject.json'
 		then: [ :object | self onFetchObject: object ]
 		catch: [ :error | error throw ].
 

diff --git a/Smalltalk/Browser/Fetch/Test/TestRequest.st → Browser/src/Test/TestRequest.st b/Smalltalk/Browser/Fetch/Test/TestRequest.st → Browser/src/Test/TestRequest.st
@@ -1,10 +1,9 @@
-CLASS TestRequest EXTENDS Test MODULE TestCore CLASSVARS '' VARS ''
-	"Also tests Response, Headers."
+CLASS TestRequest EXTENDS Test MODULE TestBrowserApp CLASSVARS '' VARS ''
 
 testRequest
 	| request |
 
-	request := Request url: 'Test/MyObject.json'.
+	request := Request url: 'MyObject.json'.
 
 	self assert: [ request class = Request ].
 	self assert: [ request bodyUsed not ].

diff --git a/Browser/web/Test/MyObject.json → Browser/web/MyObject.json b/Browser/web/Test/MyObject.json → Browser/web/MyObject.json
diff --git a/Browser/web/Test/Import.css b/Browser/web/Test/Import.css
diff --git a/Browser/web/Test/MyComponent.css b/Browser/web/Test/MyComponent.css
diff --git a/Browser/web/Test/MyComponent.html b/Browser/web/Test/MyComponent.html
diff --git a/Compiler/package-lock.json b/Compiler/package-lock.json
diff --git a/Compiler/package.json b/Compiler/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"dependencies": {
-		"@types/node": "^20.14.2",
+		"@types/node": "^20.14.8",
 		"source-map": "^0.7.4"
 	}
 }
diff --git a/Examples/Shop/Server/package-lock.json b/Examples/Shop/Server/package-lock.json
diff --git a/Examples/Shop/Server/package.json b/Examples/Shop/Server/package.json
@@ -1,12 +1,12 @@
 {
 	"type": "module",
 	"dependencies": {
-		"@types/node": "^20.14.2",
+		"@types/node": "^20.14.8",
 		"express": "^4.19.2",
 		"express-session": "^1.18.0",
 		"http-terminator": "^3.2.0",
 		"mariadb": "^3.3.1",
-		"mysql2": "^3.10.0",
+		"mysql2": "^3.10.1",
 		"node-fetch": "^3.3.2",
 		"pg": "^8.12.0"
 	}

diff --git a/Node/package-lock.json b/Node/package-lock.json
diff --git a/Node/package.json b/Node/package.json
@@ -1,12 +1,12 @@
 {
 	"type": "module",
 	"dependencies": {
-		"@types/node": "^20.14.2",
+		"@types/node": "^20.14.8",
 		"express": "^4.19.2",
 		"express-session": "^1.18.0",
 		"http-terminator": "^3.2.0",
 		"mariadb": "^3.3.1",
-		"mysql2": "^3.10.0",
+		"mysql2": "^3.10.1",
 		"node-fetch": "^3.3.2",
 		"pg": "^8.12.0"
 	}

diff --git a/Smalltalk/Browser/Fetch/Test/TestRequestOptions.st b/Smalltalk/Browser/Fetch/Test/TestRequestOptions.st
@@ -1,4 +1,4 @@
-CLASS TestRequestOptions EXTENDS Test MODULE TestCore CLASSVARS '' VARS ''
+CLASS TestRequestOptions EXTENDS Test MODULE TestBrowser CLASSVARS '' VARS ''
 
 test
 	| options request |
@@ -45,8 +45,8 @@ test
 	options priority: 'high'.
 	self assert: [ options priority = 'high' ].
 
-	request := Request url: 'Test/MyObject.json' options: options.
-	self assert: [ request url includes: 'Test/MyObject.json' ].
+	request := Request url: 'Missing.json' options: options.
+	self assert: [ request url includes: 'Missing.json' ].
 
 	self assert: [ request bodyUsed not ].
 	self assert: [ request cache = options cache ].