From a31661d150d8f4603c296404aca1a5425e3c79c9 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Wed, 8 Mar 2023 12:16:12 -0600 Subject: [PATCH] Real small passable version of script view screen/widget --- .../tests/ScriptTableTest.java | 9 ++++-- .../resources/fixtures/data/script/1.json | 4 ++- .../fixtures/data/scriptRevision/100.json | 14 ++++++++ .../fixtures/data/scriptRevision/query.json | 32 +++++++++++++++++++ .../resources/fixtures/data/scriptType/1.json | 12 +++++++ 5 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 src/test/resources/fixtures/data/scriptRevision/100.json create mode 100644 src/test/resources/fixtures/data/scriptRevision/query.json create mode 100644 src/test/resources/fixtures/data/scriptType/1.json diff --git a/src/test/java/com/kingsrook/qqq/materialdashboard/tests/ScriptTableTest.java b/src/test/java/com/kingsrook/qqq/materialdashboard/tests/ScriptTableTest.java index ca81a0e..35ed644 100755 --- a/src/test/java/com/kingsrook/qqq/materialdashboard/tests/ScriptTableTest.java +++ b/src/test/java/com/kingsrook/qqq/materialdashboard/tests/ScriptTableTest.java @@ -42,6 +42,9 @@ public class ScriptTableTest extends QBaseSeleniumTest super.addJavalinRoutes(qSeleniumJavalin); qSeleniumJavalin .withRouteToFile("/data/script/1", "data/script/1.json") + .withRouteToFile("/data/scriptType/1", "data/scriptType/1.json") + .withRouteToFile("/data/scriptRevision/query", "data/scriptRevision/query.json") + .withRouteToFile("/data/scriptRevision/100", "data/scriptRevision/100.json") .withRouteToFile("/metaData/table/script", "metaData/table/script.json") .withRouteToFile("/widget/scriptViewer", "widget/scriptViewer.json") ; @@ -57,9 +60,11 @@ public class ScriptTableTest extends QBaseSeleniumTest { qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/developer/script/1", "Hello, Script"); - qSeleniumLib.waitForSelectorContaining("span", "uh, script"); + qSeleniumLib.waitForSelectorContaining("DIV.ace_line", "var hello;"); + qSeleniumLib.waitForSelectorContaining("DIV", "2nd commit"); + qSeleniumLib.waitForSelectorContaining("DIV", "Initial checkin"); - // qSeleniumLib.waitForever(); + qSeleniumLib.waitForever(); } } diff --git a/src/test/resources/fixtures/data/script/1.json b/src/test/resources/fixtures/data/script/1.json index 59a8d1b..76c461f 100644 --- a/src/test/resources/fixtures/data/script/1.json +++ b/src/test/resources/fixtures/data/script/1.json @@ -4,6 +4,7 @@ "values": { "name": "Hello, Script", "id": 1, + "currentScriptRevisionId": 100, "tableName": "client", "createDate": "2023-02-18T00:47:51Z", "modifyDate": "2023-02-18T00:47:51Z", @@ -11,8 +12,9 @@ }, "displayValues": { "tableName": "Client", - "scriptTypeId": "Unknown", + "scriptTypeId": "Record Script", "name": "Hello, Script", + "currentScriptRevisionId": 100, "id": "1", "createDate": "2023-02-18T00:47:51Z", "modifyDate": "2023-02-18T00:47:51Z" diff --git a/src/test/resources/fixtures/data/scriptRevision/100.json b/src/test/resources/fixtures/data/scriptRevision/100.json new file mode 100644 index 0000000..c0baa2f --- /dev/null +++ b/src/test/resources/fixtures/data/scriptRevision/100.json @@ -0,0 +1,14 @@ +{ + "tableName": "scriptRevision", + "values": { + "contents": "var hello;", + "id": 100, + "commitMessage": "Initial checkin", + "author": "Jon Programmer", + "createDate": "2023-02-18T00:47:51Z", + "modifyDate": "2023-02-18T00:47:51Z" + }, + "displayValues": { + + } +} \ No newline at end of file diff --git a/src/test/resources/fixtures/data/scriptRevision/query.json b/src/test/resources/fixtures/data/scriptRevision/query.json new file mode 100644 index 0000000..e5ef09a --- /dev/null +++ b/src/test/resources/fixtures/data/scriptRevision/query.json @@ -0,0 +1,32 @@ +{ + "records": [ + { + "tableName": "scriptRevision", + "values": { + "contents": "var hello;", + "id": 100, + "sequenceNo": 2, + "commitMessage": "2nd commit", + "author": "Jon Programmer", + "createDate": "2023-02-18T00:47:51Z", + "modifyDate": "2023-02-18T00:47:51Z" + }, + "displayValues": { + } + }, + { + "tableName": "scriptRevision", + "values": { + "contents": "var goodBye;", + "id": 99, + "sequenceNo": 1, + "commitMessage": "Initial checkin", + "author": "Jane Programmer", + "createDate": "2023-02-17T00:47:51Z", + "modifyDate": "2023-02-17T00:47:51Z" + }, + "displayValues": { + } + } + ] +} \ No newline at end of file diff --git a/src/test/resources/fixtures/data/scriptType/1.json b/src/test/resources/fixtures/data/scriptType/1.json new file mode 100644 index 0000000..01c19ab --- /dev/null +++ b/src/test/resources/fixtures/data/scriptType/1.json @@ -0,0 +1,12 @@ +{ + "tableName": "scriptType", + "recordLabel": "Record Script", + "values": { + "name": "Record Script", + "id": 1, + "createDate": "2023-02-18T00:47:51Z", + "modifyDate": "2023-02-18T00:47:51Z" + }, + "displayValues": { + } +} \ No newline at end of file