refactor: e2e-test-config to separate folder (#258)

* refactor: e2e-test-config

* fix: change path for multiversion conf

* fix: change path for multiversion conf

Co-authored-by: dominik.feininger <[email protected]>

.gitignore

@@ -84,3 +84,4 @@ examples/ui5-js-app/webapp/test/__screenshots__/**/*.png
 # btp
 *.mtar
 *.zip
+*.mta

docker/Dockerfile.standalone

@@ -19,15 +19,15 @@ COPY ./examples/ui5-js-app/webapp webapp
 COPY ./examples/ui5-js-app/ui5.yaml ui5.yaml
 COPY ./docker/package-standalone.json package.json
 # this is the standard file and allows for a simple call like "wdio"
-COPY ./examples/ui5-js-app/wdio-docker-standalone.conf.js wdio.conf.js
-COPY ./examples/ui5-js-app/wdio.base.conf.js wdio.base.conf.js
+COPY ./examples/ui5-js-app/e2e-test-config/wdio-docker-standalone.conf.js wdio.conf.js
+COPY ./examples/ui5-js-app/e2e-test-config/wdio.base.conf.js wdio.base.conf.js
 RUN mkdir -p report/screenshots
 
-# install basic setup: 
-# - local minimal WebdriverIO environment 
+# install basic setup:
+# - local minimal WebdriverIO environment
 #   and setup, incl standard reporter + Chrome
 # - wdi5
 RUN npm install
 
 # run wdio + wdi5
-CMD npm test
+CMD npm test

docker/Dockerfile.wdi5

@@ -11,8 +11,8 @@ WORKDIR /app
 # COPY all to root
 COPY ../docker/package-wdi5.json package.json
 COPY ../examples/ui5-js-app/webapp/test test
-COPY ../examples/ui5-js-app/wdio-docker-selenium.conf.js wdio-docker-selenium.conf.js
-COPY ../examples/ui5-js-app/wdio.base.conf.js wdio.base.conf.js
+COPY ../examples/ui5-js-app/e2e-test-config/wdio-docker-selenium.conf.js wdio-docker-selenium.conf.js
+COPY ../examples/ui5-js-app/e2e-test-config/wdio.base.conf.js wdio.base.conf.js
 
 COPY ../ wdio-ui5-service
 

docker/package-app.json

@@ -4,9 +4,9 @@
   "description": "test for wdi5 in docker",
   "keywords": ["wdio-service", "ui5", "openui5", "sapui5", "docker"],
   "scripts": {
-    "test:docker:grid": "wdio wdio-docker.conf.js",
+    "test:docker:grid": "wdio e2e-test-config/wdio-docker.conf.js",
     "start": "soerver -d ./webapp -p 8888 -x ./webapp/proxyrc.json",
-    "test:standalone": "wdio run wdio-docker-standalone.conf.js",
+    "test:standalone": "wdio run e2e-test-config/wdio-docker-standalone.conf.js",
     "test:docker:standalone": "run-p start test:standalone"
   },
   "devDependencies": {

docker/package-standalone.json

@@ -6,7 +6,7 @@
     "start:webserver": "soerver -d ./webapp -p 8888 -x ./webapp/proxyrc.json",
     "//start:ui5-tooling": "have /app/webapp served on :8080 via ui5 tooling + simpleproxy",
     "start:ui5-tooling": "ui5 serve",
-    "wdi5": "wdio run wdio.conf.js --spec basic.test",
+    "wdi5": "wdio run e2e-test-config/wdio.conf.js --spec basic.test",
     "test": "run-p -r start:* wdi5"
   },
   "devDependencies": {

docker/package-wdi5-dev.json

@@ -4,9 +4,9 @@
   "description": "test for wdi5 in docker",
   "keywords": ["wdio-service", "ui5", "openui5", "sapui5", "docker"],
   "scripts": {
-    "test:docker:grid": "wdio wdio-docker.conf.js",
+    "test:docker:grid": "wdio e2e-test-config/wdio-docker.conf.js",
     "start": "soerver -d ./webapp -p 8888 -x ./webapp/proxyrc.json",
-    "test:standalone": "wdio run wdio-docker-standalone.conf.js",
+    "test:standalone": "wdio run e2e-test-config/wdio-docker-standalone.conf.js",
     "test:docker:standalone": "run-p start test:standalone"
   },
   "devDependencies": {

docker/package-wdi5.json

@@ -4,10 +4,10 @@
   "description": "test for wdi5 in docker",
   "keywords": ["wdio-service", "ui5", "openui5", "sapui5", "docker"],
   "scripts": {
-    "test:docker:grid": "wdio wdio-docker.conf.js",
-    "test:docker:selenium": "wdio wdio-docker-selenium.conf.js",
+    "test:docker:grid": "wdio e2e-test-config/wdio-docker.conf.js",
+    "test:docker:selenium": "wdio e2e-test-config/wdio-docker-selenium.conf.js",
     "start": "soerver -d ./webapp -p 8888 -x ./webapp/proxyrc.json",
-    "test:standalone": "wdio run wdio-docker-standalone.conf.js",
+    "test:standalone": "wdio run e2e-test-config/wdio-docker-standalone.conf.js",
     "test:docker:standalone": "run-p start test:standalone"
   },
   "devDependencies": {

examples/ui5-js-app/wdi5-multiversion.js → examples/ui5-js-app/e2e-test-config/wdi5-multiversion.js

@@ -11,9 +11,9 @@ const versions = ["", "1.71.19", "1.84.3"]
 ;(async () => {
     for (const version of versions) {
         // create an index.html for bootstrapping per version
-        const targetIndex = path.resolve(__dirname, `webapp/index-${version}.html`)
+        const targetIndex = path.resolve(__dirname, `../webapp/index-${version}.html`)
         const bootstrapSrc = `https://openui5nightly.hana.ondemand.com/${version}/resources/sap-ui-core.js`
-        fsExtra.copySync(path.resolve(__dirname, `webapp/index.html`), targetIndex)
+        fsExtra.copySync(path.resolve(__dirname, `../webapp/index.html`), targetIndex)
         const optionsIndex = {
             files: targetIndex,
             from: [/src=\".*\"/, /"sap_horizon"/],
@@ -30,7 +30,7 @@ const versions = ["", "1.71.19", "1.84.3"]
             from: [/url: "#"/, /specs: \[.*\]/],
             to: [
                 `url: "index-${version}"`, // this is only b/c of the "soerver" webserver in use...
-                `specs: ["${path.resolve(__dirname, "webapp/test/e2e/properties-matcher.test.js")}"]`
+                `specs: ["${path.resolve(__dirname, "../webapp/test/e2e/properties-matcher.test.js")}"]`
             ]
         }
         await replace(optionsWdioConf)

examples/ui5-js-app/package.json

@@ -11,11 +11,11 @@
     "test": "run-s test:*",
     "test-h": "run-s \"test:* -- --headless\"",
     "start": "soerver -d ./webapp -p 8888 -x ./webapp/proxyrc.json",
-    "test:lateInject": "wdio run wdio-ui5-late.conf.js",
-    "test:ui5tooling": "wdio run wdio-ui5tooling.conf.js",
-    "test:webserver": "wdio run wdio-webserver.conf.js",
-    "test:multiversion": "node wdi5-multiversion.js",
-    "test-selenium": "wdio run wdio-selenium-service.conf.js"
+    "test:lateInject": "wdio run e2e-test-config/wdio-ui5-late.conf.js",
+    "test:ui5tooling": "wdio run e2e-test-config/wdio-ui5tooling.conf.js",
+    "test:webserver": "wdio run e2e-test-config/wdio-webserver.conf.js",
+    "test:multiversion": "node e2e-test-config/wdi5-multiversion.js",
+    "test-selenium": "wdio run e2e-test-config/wdio-selenium-service.conf.js"
   },
   "devDependencies": {
     "@ui5/cli": "^2.14.9",