Skip to content

Commit d77489d

Browse files
matz3flovogt
authored andcommitted
Demo: iframe coverage with karma-ui5
1 parent 19b95d2 commit d77489d

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

karma-ci.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ module.exports = function(config) {
3636
singleRun: true
3737

3838
});
39+
require("karma-ui5/helper").configureIframeCoverage(config);
3940
};

webapp/test/integration/arrangements/Startup.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ sap.ui.define([
55

66
return Opa5.extend("sap.ui.demo.todo.test.integration.arrangements.Startup", {
77

8+
<<<<<<< HEAD
89
iStartMyApp() {
910
this.iStartMyUIComponent({
1011
componentConfig: {
@@ -13,6 +14,10 @@ sap.ui.define([
1314
manifest: true
1415
}
1516
});
17+
=======
18+
iStartMyApp: function () {
19+
this.iStartMyAppInAFrame(sap.ui.require.toUrl("sap/ui/demo/todo/index") + ".html");
20+
>>>>>>> 8245e706 (Demo: iframe coverage with karma-ui5)
1621
}
1722

1823
});

0 commit comments

Comments
 (0)