Google Git
Sign in
dart/pub.git/7ab4020e^!/.
commit
7ab4020e1d6eb1ba3aae0627d874e29d32f29c96
[log]
author
Sigurd Meldgaard <sigurdm@google.com>
Thu May 16 13:05:47 2024 +0200
committer
GitHub <noreply@github.com>
Thu May 16 13:05:47 2024 +0200
tree
bf5ca847a3d515dc41c8e7d2e4e58adb82c1386f
parent
c2592b3efa10321f5b7c05c496e457255a07599f [diff]
Connect to _PUB_TEST_DEFAULT_HOSTED_URL instead of pub.dev when testing (#4270)


diff --git a/lib/src/source/hosted.dart b/lib/src/source/hosted.dart
index 693a4e9..7e37bd6 100644
--- a/lib/src/source/hosted.dart
+++ b/lib/src/source/hosted.dart

@@ -109,6 +109,11 @@
     log.fine('Using https://pub.dev instead of https://pub.dartlang.org.');
     u = Uri.parse('https://pub.dev');
   }
+  if (runningFromTest &&
+      u == Uri.parse('https://pub.dev') &&
+      Platform.environment.containsKey('_PUB_TEST_DEFAULT_HOSTED_URL')) {
+    u = Uri.parse(Platform.environment['_PUB_TEST_DEFAULT_HOSTED_URL']!);
+  }
   return u;
 }
 

diff --git a/test/dependency_services/dependency_services_test.dart b/test/dependency_services/dependency_services_test.dart
index 33937b3..11ccb68 100644
--- a/test/dependency_services/dependency_services_test.dart
+++ b/test/dependency_services/dependency_services_test.dart

@@ -331,8 +331,8 @@
 
   testWithGolden('Preserves pub.dartlang.org as hosted url', (context) async {
     final server = (await servePackages())
-      ..serve('foo', '1.2.3')
-      ..serve('bar', '1.2.3')
+      ..serve(r'foo', '1.2.3')
+      ..serve(r'bar', '1.2.3')
       ..serveContentHashes = true;
 
     await d.dir(appPath, [

diff --git a/test/testdata/goldens/dependency_services/dependency_services_test/Preserves pub.dartlang.org as hosted url.txt b/test/testdata/goldens/dependency_services/dependency_services_test/Preserves pub.dartlang.org as hosted url.txt
index fe5e2ca..cb49c3a 100644
--- a/test/testdata/goldens/dependency_services/dependency_services_test/Preserves pub.dartlang.org as hosted url.txt
+++ b/test/testdata/goldens/dependency_services/dependency_services_test/Preserves pub.dartlang.org as hosted url.txt

@@ -39,7 +39,7 @@
         "type": "hosted",
         "description": {
           "name": "bar",
-          "url": "https://pub.dev",
+          "url": "http://localhost:$PORT",
           "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
         }
       }
@@ -53,7 +53,7 @@
         "type": "hosted",
         "description": {
           "name": "foo",
-          "url": "https://pub.dev",
+          "url": "http://localhost:$PORT",
           "sha256": "b2b7fc405959806aa1f31ac7e68752534f66f66a11a280d9878ecb6cd835f01c"
         }
       }
@@ -75,121 +75,15 @@
         "type": "hosted",
         "description": {
           "name": "bar",
-          "url": "https://pub.dev",
+          "url": "http://localhost:$PORT",
           "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
         }
       },
-      "latest": null,
+      "latest": "1.2.3",
       "constraint": "^1.0.0",
-      "compatible": [
-        {
-          "name": "bar",
-          "version": "1.2.3",
-          "kind": "direct",
-          "source": {
-            "type": "hosted",
-            "description": {
-              "name": "bar",
-              "url": "http://localhost:$PORT",
-              "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
-            }
-          },
-          "constraintBumped": "^1.0.0",
-          "constraintWidened": "^1.0.0",
-          "constraintBumpedIfNeeded": "^1.0.0",
-          "previousVersion": "1.2.3",
-          "previousConstraint": "^1.0.0",
-          "previousSource": {
-            "type": "hosted",
-            "description": {
-              "name": "bar",
-              "url": "https://pub.dev",
-              "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
-            }
-          }
-        },
-        {
-          "name": "foo",
-          "version": "1.2.4",
-          "kind": "direct",
-          "source": {
-            "type": "hosted",
-            "description": {
-              "name": "foo",
-              "url": "http://localhost:$PORT",
-              "sha256": "0362935f659b1fd166b6036575bffd6e735cd9953eb60324192d1fdd4929b4c1"
-            }
-          },
-          "constraintBumped": "^1.0.0",
-          "constraintWidened": "^1.0.0",
-          "constraintBumpedIfNeeded": "^1.0.0",
-          "previousVersion": "1.2.3",
-          "previousConstraint": "^1.0.0",
-          "previousSource": {
-            "type": "hosted",
-            "description": {
-              "name": "foo",
-              "url": "https://pub.dev",
-              "sha256": "b2b7fc405959806aa1f31ac7e68752534f66f66a11a280d9878ecb6cd835f01c"
-            }
-          }
-        }
-      ],
+      "compatible": [],
       "singleBreaking": [],
-      "multiBreaking": [
-        {
-          "name": "bar",
-          "version": "1.2.3",
-          "kind": "direct",
-          "source": {
-            "type": "hosted",
-            "description": {
-              "name": "bar",
-              "url": "http://localhost:$PORT",
-              "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
-            }
-          },
-          "constraintBumped": "^1.2.3",
-          "constraintWidened": "^1.0.0",
-          "constraintBumpedIfNeeded": "^1.0.0",
-          "previousVersion": "1.2.3",
-          "previousConstraint": "^1.0.0",
-          "previousSource": {
-            "type": "hosted",
-            "description": {
-              "name": "bar",
-              "url": "https://pub.dev",
-              "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
-            }
-          }
-        },
-        {
-          "name": "foo",
-          "version": "1.2.4",
-          "kind": "direct",
-          "source": {
-            "type": "hosted",
-            "description": {
-              "name": "foo",
-              "url": "http://localhost:$PORT",
-              "sha256": "0362935f659b1fd166b6036575bffd6e735cd9953eb60324192d1fdd4929b4c1"
-            }
-          },
-          "constraintBumped": "^1.2.4",
-          "constraintWidened": "^1.0.0",
-          "constraintBumpedIfNeeded": "^1.0.0",
-          "previousVersion": "1.2.3",
-          "previousConstraint": "^1.0.0",
-          "previousSource": {
-            "type": "hosted",
-            "description": {
-              "name": "foo",
-              "url": "https://pub.dev",
-              "sha256": "b2b7fc405959806aa1f31ac7e68752534f66f66a11a280d9878ecb6cd835f01c"
-            }
-          }
-        }
-      ]
+      "multiBreaking": []
     },
     {
       "name": "foo",
@@ -199,40 +93,14 @@
         "type": "hosted",
         "description": {
           "name": "foo",
-          "url": "https://pub.dev",
+          "url": "http://localhost:$PORT",
           "sha256": "b2b7fc405959806aa1f31ac7e68752534f66f66a11a280d9878ecb6cd835f01c"
         }
       },
-      "latest": "0.0.1",
+      "latest": "1.2.4",
       "constraint": "^1.0.0",
       "compatible": [
         {
-          "name": "bar",
-          "version": "1.2.3",
-          "kind": "direct",
-          "source": {
-            "type": "hosted",
-            "description": {
-              "name": "bar",
-              "url": "http://localhost:$PORT",
-              "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
-            }
-          },
-          "constraintBumped": "^1.0.0",
-          "constraintWidened": "^1.0.0",
-          "constraintBumpedIfNeeded": "^1.0.0",
-          "previousVersion": "1.2.3",
-          "previousConstraint": "^1.0.0",
-          "previousSource": {
-            "type": "hosted",
-            "description": {
-              "name": "bar",
-              "url": "https://pub.dev",
-              "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
-            }
-          }
-        },
-        {
           "name": "foo",
           "version": "1.2.4",
           "kind": "direct",
@@ -253,40 +121,13 @@
             "type": "hosted",
             "description": {
               "name": "foo",
-              "url": "https://pub.dev",
+              "url": "http://localhost:$PORT",
               "sha256": "b2b7fc405959806aa1f31ac7e68752534f66f66a11a280d9878ecb6cd835f01c"
             }
           }
         }
       ],
-      "singleBreaking": [],
-      "multiBreaking": [
-        {
-          "name": "bar",
-          "version": "1.2.3",
-          "kind": "direct",
-          "source": {
-            "type": "hosted",
-            "description": {
-              "name": "bar",
-              "url": "http://localhost:$PORT",
-              "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
-            }
-          },
-          "constraintBumped": "^1.2.3",
-          "constraintWidened": "^1.0.0",
-          "constraintBumpedIfNeeded": "^1.0.0",
-          "previousVersion": "1.2.3",
-          "previousConstraint": "^1.0.0",
-          "previousSource": {
-            "type": "hosted",
-            "description": {
-              "name": "bar",
-              "url": "https://pub.dev",
-              "sha256": "0b119406be305b6e65d33551008b5b72fdd810965f0df914478c940d5fe28e53"
-            }
-          }
-        },
+      "singleBreaking": [
         {
           "name": "foo",
           "version": "1.2.4",
@@ -308,7 +149,35 @@
             "type": "hosted",
             "description": {
               "name": "foo",
-              "url": "https://pub.dev",
+              "url": "http://localhost:$PORT",
+              "sha256": "b2b7fc405959806aa1f31ac7e68752534f66f66a11a280d9878ecb6cd835f01c"
+            }
+          }
+        }
+      ],
+      "multiBreaking": [
+        {
+          "name": "foo",
+          "version": "1.2.4",
+          "kind": "direct",
+          "source": {
+            "type": "hosted",
+            "description": {
+              "name": "foo",
+              "url": "http://localhost:$PORT",
+              "sha256": "0362935f659b1fd166b6036575bffd6e735cd9953eb60324192d1fdd4929b4c1"
+            }
+          },
+          "constraintBumped": "^1.2.4",
+          "constraintWidened": "^1.0.0",
+          "constraintBumpedIfNeeded": "^1.0.0",
+          "previousVersion": "1.2.3",
+          "previousConstraint": "^1.0.0",
+          "previousSource": {
+            "type": "hosted",
+            "description": {
+              "name": "foo",
+              "url": "http://localhost:$PORT",
               "sha256": "b2b7fc405959806aa1f31ac7e68752534f66f66a11a280d9878ecb6cd835f01c"
             }
           }