diff --git a/package.json b/package.json index 04fc18b..4251b49 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.1.0", "description": "SAP Community Code Challenge: This repository contains an empty OpenUI5 application and end-to-end test written with wdi5. Take part in the challenge and develop an app that passes the tests.", "scripts": { - "start": "ui5 serve --port 8080", + "start": "ui5 serve --port 8080 -o index.html", "test": "wdio run wdio.conf.js", "ci-test": "run-p -r start wait-then-test", "wait-then-test": "wait-on tcp:8080 && npm run test -- --headless" diff --git a/wdio.conf.js b/wdio.conf.js index 36b5944..e17b140 100644 --- a/wdio.conf.js +++ b/wdio.conf.js @@ -67,10 +67,7 @@ exports.config = { browserName: 'chrome', acceptInsecureCerts: true, "goog:chromeOptions": { - args: - process.argv.indexOf("--headless") > -1 - ? ["--headless"] - : [] + args: ["--headless"] } // If outputDir is provided WebdriverIO can capture driver session logs // it is possible to configure which logTypes to include/exclude. diff --git a/webapp/controller/BaseController.js b/webapp/controller/BaseController.js index c1b5e76..7e35b9f 100644 --- a/webapp/controller/BaseController.js +++ b/webapp/controller/BaseController.js @@ -1,6 +1,7 @@ sap.ui.define([ - "sap/ui/core/mvc/Controller" -], function (Controller) { + "sap/ui/core/mvc/Controller", + "sap/ui/core/UIComponent" +], function (Controller, UIComponent) { "use strict"; return Controller.extend("ui5.challenge.controller.BaseController", { diff --git a/webapp/controller/Main.controller.js b/webapp/controller/Main.controller.js new file mode 100644 index 0000000..bb02989 --- /dev/null +++ b/webapp/controller/Main.controller.js @@ -0,0 +1,37 @@ +sap.ui.define([ + "./BaseController", + "sap/ui/model/json/JSONModel" +], function(BaseController, JSONModel) { + "use strict" + + return BaseController.extend("ui5.challenge.controller.Main", { + + onInit: function() { + + var aData = { + persons: [ + { + name: "Max Mustermann", + alter: 33 + }, + { + name: "Maria Musterfrau", + alter: 40 + }, + { + name: "Mara Mustermensch", + alter: 24 + } + ] + }; + + var oModel = new JSONModel(aData); + this.getView().setModel(oModel); + }, + + navToDetail: function() { + this.navTo("Detail"); + } + + }) +}) \ No newline at end of file diff --git a/webapp/i18n/i18n.properties b/webapp/i18n/i18n.properties index e69de29..ae77ae4 100644 --- a/webapp/i18n/i18n.properties +++ b/webapp/i18n/i18n.properties @@ -0,0 +1,4 @@ +appTitle=ui-challenge +appDescription=Application to test the new testframewok for UI5 +mainTitleText=wdi5 rocks +ListHeaderTitle=Person List \ No newline at end of file diff --git a/webapp/index.html b/webapp/index.html index 01c1bb6..f3ea286 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -1,7 +1,7 @@ - title + ui5-challenge