Skip to content

Commit

Permalink
Add latest changes after resolving conflicts...
Browse files Browse the repository at this point in the history
  • Loading branch information
matz3 committed Mar 24, 2020
1 parent 3a4329e commit 2341c79
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions test/lib/translators/ui5Framework.integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@ function defineTest(testName, {
{
name: "sap.ui.lib4",
optional: true
},
{
name: "sap.ui.lib8",
development: true
}
]
}
Expand Down Expand Up @@ -222,6 +226,11 @@ function defineTest(testName, {
{
name: "sap.ui.lib6",
development: true
},
{
name: "sap.ui.lib8",
// optional dependency gets resolved by dev-dependency of root project
optional: true
}
]
}
Expand Down Expand Up @@ -289,6 +298,16 @@ function defineTest(testName, {
},
framework: {libraries: []}
}];
case path.join(ui5PackagesBaseDir, npmScope, "sap.ui.lib8",
frameworkName === "SAPUI5" ? "1.75.8" : "1.75.0"):
return [{
specVersion: "1.0",
type: "library",
metadata: {
name: "sap.ui.lib8"
},
framework: {libraries: []}
}];
default:
throw new Error(
"ProjectPreprocessor#readConfigFile stub called with unknown project: " +
Expand Down

0 comments on commit 2341c79

Please sign in to comment.