Add a couple of last nitpick tweaks to withUrlMatching before merge

Author: pimterry

src/rules/base-rule-builder.ts

@@ -31,7 +31,7 @@ import {
     HostnameMatcher,
     PortMatcher,
     ProtocolMatcher,
-    RegexUrlMatcher,
+    RegexUrlMatcher
 } from "./matchers";
 
 /**
@@ -237,7 +237,7 @@ export abstract class BaseRuleBuilder {
     }
 
     /**
-     * Match only requests that sent with the given protocol.
+     * Match only requests sent with the given protocol.
      * @category Matching
      */
     withProtocol(protocol: "http" | "https" | "ws" | "wss"): this {
@@ -246,7 +246,7 @@ export abstract class BaseRuleBuilder {
     }
 
     /**
-     * Match only requests that has absolute url matching the given RegExp.
+     * Match only requests whose absolute url matches the given RegExp.
      * @category Matching
      */
     withUrlMatching(pattern: RegExp): this {

src/rules/matchers.ts

@@ -274,15 +274,14 @@ export class RegexUrlMatcher extends Serializable implements RequestMatcher {
 
     matches(request: OngoingRequest) {
         const absoluteUrl = normalizeUrl(request.url);
-        const urlPath = getPathFromAbsoluteUrl(absoluteUrl);
 
         // Test the matcher against the full URL
         const urlMatcher = new RegExp(this.regexSource, this.regexFlags);
         return urlMatcher.test(absoluteUrl);
     }
 
     explain() {
-        return `matching /${unescapeRegexp(this.regexSource)}/${this.regexFlags ?? ''}`;
+        return `matching URL /${unescapeRegexp(this.regexSource)}/${this.regexFlags ?? ''}`;
     }
 
 }

test/integration/matchers/method-path-matching.spec.ts

@@ -128,20 +128,24 @@ responses by hand.`);
         await expect(result).to.have.responseText('Fake file');
     });
 
-    it("should regex match requests for a matching URL with negative regexp -- pass", async () => {
+    it("should not negative-regex match requests by full URL with forX matchers", async () => {
+        // It's not so much that this is desired behaviour - more that it follows from the
+        // definition of forGet matching, and we want to preserve it for now, as opposed
+        // to usage of withUrlMatching (below) which does _not_ behave like this.
+
         await server.forGet(/^(?!.*localhost)/).thenReply(200, 'Fake file');
-        
+
         let result = await fetch(server.urlFor('/matching-file.txt'));
 
-        await expect(result).to.have.responseText('Fake file');          
+        await expect(result).to.have.responseText('Fake file');
     });
 
-    it("should regex match requests for a matching URL with negative regexp -- catch", async () => {
+    it("should negative-regex match requests by full URL with withUrlMatching", async () => {
         await server.forGet().withUrlMatching(/^(?!.*localhost)/).thenReply(200, 'Fake file');
-        
+
         let result2 = await fetch(server.urlFor('/matching-file.txt'));
 
-        await expect(result2).to.have.responseText(/^.*No rules*./);        
+        await expect(result2).to.have.responseText(/^.*No rules*./);
     });
 
     it("should reject requests for the wrong path", async () => {
@@ -159,7 +163,6 @@ responses by hand.`);
 
         expect(result.status).to.equal(503);
     });
-    
 
     it("should match requests ignoring the query string", async () => {
         await server.forGet('/path').thenReply(200, 'Matched path');