Skip to content

Commit

Permalink
fix: Enable Render tests
Browse files Browse the repository at this point in the history
  • Loading branch information
d3xter666 committed Oct 23, 2024
1 parent f502529 commit cd4d398
Show file tree
Hide file tree
Showing 20 changed files with 350 additions and 42 deletions.
3 changes: 2 additions & 1 deletion src/linter/ui5Types/SourceFileLinter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ export default class SourceFileLinter {
// Analyze renderer property when it's referenced by a variable or even another module
// i.e. { renderer: Renderer }
if (ts.isIdentifier(node.initializer)) {
const {symbol: {declarations}} = this.#checker.getTypeAtLocation(node);
const {symbol} = this.#checker.getTypeAtLocation(node);
const {declarations} = symbol ?? {};
declarations?.forEach((declaration) => this.analyzeControlRendererInternals(declaration));
} else {
// Analyze renderer property when it's directly embedded in the renderer object
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sap.ui.define(["sap/ui/core/Control"], function (Control) {
var myControl = Control.extend("myControl", {
var myControl = Control.extend("mycomp.myControl", {
metadata: {},
renderer: {
apiVersion: 1,
Expand Down
8 changes: 8 additions & 0 deletions test/fixtures/linter/rules/Render/2Control.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
sap.ui.define(["sap/ui/core/Control", "./2ControlRenderer"], function (Control, Renderer) {
var myControl = Control.extend("mycomp.myControl", {
metadata: {},
renderer: Renderer,
});

return myControl;
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sap.ui.define(["sap/ui/core/Control"], function (Control) {
var myControl = Control.extend("myControl", {
var myControl = Control.extend("mycomp.myControl", {
metadata: {},
renderer: (oRm, oMyControl) => {
oRm.openStart("div", oMyControl);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ sap.ui.define(["sap/ui/core/Control"], function (Control) {
oRm.close("div");
};

const a = zzzz;
const b = a;
const c = b;

var myControl = Control.extend("myControl", {
var myControl = Control.extend("mycomp.myControl", {
metadata: {},
renderer,
});
Expand Down
8 changes: 8 additions & 0 deletions test/fixtures/linter/rules/Render/5Control.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
sap.ui.define(["sap/ui/core/Control", "./5ControlRenderer"], function (Control, Renderer) {
var myControl = Control.extend("mycomp.myControl", {
metadata: {},
renderer: Renderer,
});

return myControl;
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sap.ui.define(["sap/ui/core/Control"], function (Control) {
var myControl = Control.extend("myControl", {
var myControl = Control.extend("mycomp.myControl", {
metadata: {},
renderer: {
apiVersion: 2,
Expand Down
8 changes: 8 additions & 0 deletions test/fixtures/linter/rules/Render/7Control.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
sap.ui.define(["sap/ui/core/Control", "./7ControlRenderer"], function (Control, Renderer) {
var myControl = Control.extend("mycomp.myControl", {
metadata: {},
renderer: Renderer,
});

return myControl;
});
8 changes: 8 additions & 0 deletions test/fixtures/linter/rules/Render/8Control.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
sap.ui.define(["sap/ui/core/Control", "./8ControlRenderer"], function (Control, Renderer) {
var myControl = Control.extend("mycomp.myControl", {
metadata: {},
renderer: Renderer,
});

return myControl;
});
8 changes: 0 additions & 8 deletions test/fixtures/linter/rules/Render/Control_2.js

This file was deleted.

8 changes: 0 additions & 8 deletions test/fixtures/linter/rules/Render/Control_5.js

This file was deleted.

8 changes: 0 additions & 8 deletions test/fixtures/linter/rules/Render/Control_7.js

This file was deleted.

8 changes: 0 additions & 8 deletions test/fixtures/linter/rules/Render/Control_8.js

This file was deleted.

2 changes: 1 addition & 1 deletion test/lib/linter/_linterHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function createTestsForFixtures(fixturesPath: string) {
if (!testFiles.length) {
throw new Error(`Failed to find any fixtures in directory ${fixturesPath}`);
}
if (fixturesPath.includes("AsyncComponentFlags")) {
if (fixturesPath.includes("AsyncComponentFlags") || fixturesPath.includes("Render")) {
const dirName = path.basename(fixturesPath);
testDefinition({
testName: dirName,
Expand Down
Loading

0 comments on commit cd4d398

Please sign in to comment.