feat(web): accept Answerable as argument of ExecuteScript.from(source…

…Url) this makes it easier to inject scripts which URL becomes known only at runtime, e.g. scripts parameterised with a query string
serenity-js · Oct 7, 2022 · 0b06703 · 0b06703
1 parent 9c9a6ec
commit 0b06703
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...ration/web-specs/spec/screenplay/interactions/execute-script/ExecuteScriptFromUrl.spec.ts b/...ration/web-specs/spec/screenplay/interactions/execute-script/ExecuteScriptFromUrl.spec.ts
@@ -50,7 +50,7 @@ describe('ExecuteScriptFromUrl', function () {
 
     it('provides a sensible description of the interaction being performed', () => {
         expect(ExecuteScript.from('https://localhost/script.js').toString())
-            .to.equal(`#actor executes a script from https://localhost/script.js`);
+            .to.equal(`#actor executes a script from 'https://localhost/script.js'`);
     });
 
     it('correctly detects its invocation location', () => {

diff --git a/packages/web/src/screenplay/interactions/ExecuteScript.ts b/packages/web/src/screenplay/interactions/ExecuteScript.ts
@@ -24,7 +24,7 @@ export class ExecuteScript {
      * @param sourceUrl
      *  The URL to load the script from
      */
-    static from(sourceUrl: string): Interaction {
+    static from(sourceUrl: Answerable<string>): Interaction {
         return new ExecuteScriptFromUrl(sourceUrl);
     }
 
@@ -267,15 +267,16 @@ class ExecuteAsynchronousScript extends ExecuteScriptWithArguments {
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLScriptElement
  */
 class ExecuteScriptFromUrl extends Interaction {
-    constructor(private readonly sourceUrl: string) {
-        super(`#actor executes a script from ${ sourceUrl }`);
+    constructor(private readonly sourceUrl: Answerable<string>) {
+        super(d`#actor executes a script from ${ sourceUrl }`);
     }
 
     /**
      * @inheritDoc
      */
     async performAs(actor: UsesAbilities & AnswersQuestions): Promise<any> {
-        const page = await BrowseTheWeb.as(actor).currentPage();
+        const page      = await BrowseTheWeb.as(actor).currentPage();
+        const sourceUrl = await actor.answer(this.sourceUrl);
 
         return page.executeAsyncScript(
             /* istanbul ignore next */
@@ -300,7 +301,7 @@ class ExecuteScriptFromUrl extends Interaction {
                 script.async = true;
                 document.head.append(script);
             },
-            this.sourceUrl
+            sourceUrl
         )
         .then(errorMessage => {
             if (errorMessage) {