Merge branch '4.x' of github.com:codeceptjs/CodeceptJS into 4.x

Author: DavertMik

docs/helpers/Playwright.md

@@ -739,6 +739,22 @@ I.dontSeeCookie('auth'); // no auth cookie
 
 Returns **void** automatically synchronized promise through #recorder
 
+### dontSeeCurrentPathEquals
+
+Checks that current URL path does NOT match the expected path.
+Query strings and URL fragments are ignored.
+
+```js
+I.dontSeeCurrentPathEquals('/form'); // fails for '/form', '/form?user=1', '/form#section'
+I.dontSeeCurrentPathEquals('/'); // fails for '/', '/?user=ok', '/#top'
+```
+
+#### Parameters
+
+*   `path` **[string][9]** value to check.
+
+Returns **void** automatically synchronized promise through #recorder
+
 ### dontSeeCurrentUrlEquals
 
 Checks that current url is not equal to provided one.
@@ -1994,6 +2010,22 @@ I.seeCssPropertiesOnElements('h3', { 'font-weight': "bold"});
 
 Returns **void** automatically synchronized promise through #recorder
 
+### seeCurrentPathEquals
+
+Checks that current URL path matches the expected path.
+Query strings and URL fragments are ignored.
+
+```js
+I.seeCurrentPathEquals('/info'); // passes for '/info', '/info?user=1', '/info#section'
+I.seeCurrentPathEquals('/'); // passes for '/', '/?user=ok', '/#top'
+```
+
+#### Parameters
+
+*   `path` **[string][9]** value to check.
+
+Returns **void** automatically synchronized promise through #recorder
+
 ### seeCurrentUrlEquals
 
 Checks that current url is equal to provided one.

docs/helpers/Puppeteer.md

@@ -622,6 +622,22 @@ I.dontSeeCookie('auth'); // no auth cookie
 
 Returns **void** automatically synchronized promise through #recorder
 
+### dontSeeCurrentPathEquals
+
+Checks that current URL path does NOT match the expected path.
+Query strings and URL fragments are ignored.
+
+```js
+I.dontSeeCurrentPathEquals('/form'); // fails for '/form', '/form?user=1', '/form#section'
+I.dontSeeCurrentPathEquals('/'); // fails for '/', '/?user=ok', '/#top'
+```
+
+#### Parameters
+
+*   `path` **[string][6]** value to check.
+
+Returns **void** automatically synchronized promise through #recorder
+
 ### dontSeeCurrentUrlEquals
 
 Checks that current url is not equal to provided one.
@@ -1762,6 +1778,22 @@ Returns **void** automatically synchronized promise through #recorder
 This action supports [React locators](https://codecept.io/react#locators)
 
 
+### seeCurrentPathEquals
+
+Checks that current URL path matches the expected path.
+Query strings and URL fragments are ignored.
+
+```js
+I.seeCurrentPathEquals('/info'); // passes for '/info', '/info?user=1', '/info#section'
+I.seeCurrentPathEquals('/'); // passes for '/', '/?user=ok', '/#top'
+```
+
+#### Parameters
+
+*   `path` **[string][6]** value to check.
+
+Returns **void** automatically synchronized promise through #recorder
+
 ### seeCurrentUrlEquals
 
 Checks that current url is equal to provided one.

docs/helpers/WebDriver.md

@@ -794,6 +794,22 @@ I.dontSeeCookie('auth'); // no auth cookie
 
 Returns **void** automatically synchronized promise through #recorder
 
+### dontSeeCurrentPathEquals
+
+Checks that current URL path does NOT match the expected path.
+Query strings and URL fragments are ignored.
+
+```js
+I.dontSeeCurrentPathEquals('/form'); // fails for '/form', '/form?user=1', '/form#section'
+I.dontSeeCurrentPathEquals('/'); // fails for '/', '/?user=ok', '/#top'
+```
+
+#### Parameters
+
+*   `path` **[string][18]** value to check.
+
+Returns **void** automatically synchronized promise through #recorder
+
 ### dontSeeCurrentUrlEquals
 
 Checks that current url is not equal to provided one.
@@ -1870,6 +1886,22 @@ I.seeCssPropertiesOnElements('h3', { 'font-weight': "bold"});
 
 Returns **void** automatically synchronized promise through #recorder
 
+### seeCurrentPathEquals
+
+Checks that current URL path matches the expected path.
+Query strings and URL fragments are ignored.
+
+```js
+I.seeCurrentPathEquals('/info'); // passes for '/info', '/info?user=1', '/info#section'
+I.seeCurrentPathEquals('/'); // passes for '/', '/?user=ok', '/#top'
+```
+
+#### Parameters
+
+*   `path` **[string][18]** value to check.
+
+Returns **void** automatically synchronized promise through #recorder
+
 ### seeCurrentUrlEquals
 
 Checks that current url is equal to provided one.

docs/webapi/dontSeeCurrentPathEquals.mustache

@@ -0,0 +1,10 @@
+Checks that current URL path does NOT match the expected path.
+Query strings and URL fragments are ignored.
+
+```js
+I.dontSeeCurrentPathEquals('/form'); // fails for '/form', '/form?user=1', '/form#section'
+I.dontSeeCurrentPathEquals('/'); // fails for '/', '/?user=ok', '/#top'
+```
+
+@param {string} path value to check.
+@returns {void} automatically synchronized promise through #recorder

docs/webapi/seeCurrentPathEquals.mustache

@@ -0,0 +1,10 @@
+Checks that current URL path matches the expected path.
+Query strings and URL fragments are ignored.
+
+```js
+I.seeCurrentPathEquals('/info'); // passes for '/info', '/info?user=1', '/info#section'
+I.seeCurrentPathEquals('/'); // passes for '/', '/?user=ok', '/#top'
+```
+
+@param {string} path value to check.
+@returns {void} automatically synchronized promise through #recorder

lib/helper/Playwright.js

@@ -2405,6 +2405,26 @@ class Playwright extends Helper {
     urlEquals(this.options.url).negate(url, await this._getPageUrl())
   }
 
+  /**
+   * {{> seeCurrentPathEquals }}
+   */
+  async seeCurrentPathEquals(path) {
+    const currentUrl = await this._getPageUrl()
+    const baseUrl = this.options.url || 'http://localhost'
+    const actualPath = new URL(currentUrl, baseUrl).pathname
+    return equals('url path').assert(path, actualPath)
+  }
+
+  /**
+   * {{> dontSeeCurrentPathEquals }}
+   */
+  async dontSeeCurrentPathEquals(path) {
+    const currentUrl = await this._getPageUrl()
+    const baseUrl = this.options.url || 'http://localhost'
+    const actualPath = new URL(currentUrl, baseUrl).pathname
+    return equals('url path').negate(path, actualPath)
+  }
+
   /**
    * {{> see }}
    *

lib/helper/Puppeteer.js

@@ -1684,6 +1684,26 @@ class Puppeteer extends Helper {
     urlEquals(this.options.url).negate(url, await this._getPageUrl())
   }
 
+  /**
+   * {{> seeCurrentPathEquals }}
+   */
+  async seeCurrentPathEquals(path) {
+    const currentUrl = await this._getPageUrl()
+    const baseUrl = this.options.url || 'http://localhost'
+    const actualPath = new URL(currentUrl, baseUrl).pathname
+    return equals('url path').assert(path, actualPath)
+  }
+
+  /**
+   * {{> dontSeeCurrentPathEquals }}
+   */
+  async dontSeeCurrentPathEquals(path) {
+    const currentUrl = await this._getPageUrl()
+    const baseUrl = this.options.url || 'http://localhost'
+    const actualPath = new URL(currentUrl, baseUrl).pathname
+    return equals('url path').negate(path, actualPath)
+  }
+
   /**
    * {{> see }}
    *

lib/helper/WebDriver.js

@@ -1844,6 +1844,26 @@ class WebDriver extends Helper {
     return urlEquals(this.options.url).negate(url, decodeUrl(res))
   }
 
+  /**
+   * {{> seeCurrentPathEquals }}
+   */
+  async seeCurrentPathEquals(path) {
+    const currentUrl = await this.browser.getUrl()
+    const baseUrl = this.options.url || 'http://localhost'
+    const actualPath = new URL(currentUrl, baseUrl).pathname
+    return equals('url path').assert(path, actualPath)
+  }
+
+  /**
+   * {{> dontSeeCurrentPathEquals }}
+   */
+  async dontSeeCurrentPathEquals(path) {
+    const currentUrl = await this.browser.getUrl()
+    const baseUrl = this.options.url || 'http://localhost'
+    const actualPath = new URL(currentUrl, baseUrl).pathname
+    return equals('url path').negate(path, actualPath)
+  }
+
   /**
    * Wraps [execute](http://webdriver.io/api/protocol/execute.html) command.
    *

test/data/app/glue.php

@@ -44,7 +44,7 @@ class glue {
         static function stick ($urls) {
 
             $method = strtoupper($_SERVER['REQUEST_METHOD']);
-            $path = $_SERVER['REQUEST_URI'];
+            $path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
 
             $found = false;
 

test/helper/webapi.js

@@ -75,6 +75,45 @@ export function tests() {
       const url = await I.grabCurrentUrl()
       assert.equal(url, `${siteUrl}/info`)
     })
+
+    it('should check for equality with query strings', async () => {
+      await I.amOnPage('/info?user=test')
+      // Query strings matter for exact equality
+      await I.seeCurrentUrlEquals('/info?user=test')
+      await I.dontSeeCurrentUrlEquals('/info')
+      // But substring check works
+      await I.seeInCurrentUrl('/info')
+      await I.seeInCurrentUrl('user=test')
+    })
+
+    it('should handle root path with query strings', async () => {
+      await I.amOnPage('/?user=ok')
+      // Query strings matter - exact equality requires query string
+      await I.seeCurrentUrlEquals('/?user=ok')
+      await I.dontSeeCurrentUrlEquals('/')
+      // But substring check works for path fragment
+      await I.seeInCurrentUrl('/')
+    })
+
+    it('should check path equality ignoring query strings', async () => {
+      await I.amOnPage('/info?user=test')
+      // Path equality ignores query strings
+      await I.seeCurrentPathEquals('/info')
+      await I.dontSeeCurrentPathEquals('/form')
+      await I.dontSeeCurrentPathEquals('/info?user=test')
+    })
+
+    it('should check root path equality ignoring query strings', async () => {
+      await I.amOnPage('/?user=ok')
+      await I.seeCurrentPathEquals('/')
+      await I.dontSeeCurrentPathEquals('/info')
+    })
+
+    it('should check path equality ignoring hash fragments', async () => {
+      await I.amOnPage('/info#section')
+      await I.seeCurrentPathEquals('/info')
+      await I.dontSeeCurrentPathEquals('/info#section')
+    })
   })
 
   describe('#waitInUrl, #waitUrlEquals', () => {