Skip to content

Commit 6a0c7db

Browse files
authored
Merge pull request #4727 from easyops-cn/williamcai/packages/brick-kit/internal/poll/fix_evaluation_internal_not_work
Williamcai/packages/brick kit/internal/poll/fix evaluation internal not work
2 parents 231a26c + ab97815 commit 6a0c7db

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

packages/brick-kit/src/core/Kernel.spec.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ describe("Kernel", () => {
617617
en: { name: "Application G" },
618618
},
619619
},
620-
meta: [],
620+
meta: {},
621621
routes: [
622622
{
623623
path: "${app.homepage}/test",
@@ -649,7 +649,7 @@ describe("Kernel", () => {
649649
userConfig: { runtimeUserConf: 9 },
650650
},
651651
bootstrapFile: "bootstrap.mini.g.json",
652-
meta: [],
652+
meta: {},
653653
routes: [{ path: "${app.homepage}/test" }],
654654
});
655655
});
@@ -728,7 +728,7 @@ describe("Kernel", () => {
728728
en: { name: "Application G" },
729729
},
730730
},
731-
meta: [],
731+
meta: {},
732732
routes: [
733733
{
734734
path: "${app.homepage}/test",
@@ -760,7 +760,7 @@ describe("Kernel", () => {
760760
userConfig: { runtimeUserConf: 9 },
761761
},
762762
bootstrapFile: "bootstrap.mini.g.json",
763-
meta: [],
763+
meta: {},
764764
routes: [{ path: "${app.homepage}/test" }],
765765
});
766766
});
@@ -782,6 +782,7 @@ describe("Kernel", () => {
782782
defaultConfig: { configA: { key1: "value1" } },
783783
},
784784
};
785+
const blackList = [{ url: "/test" }];
785786
mockStandaloneBootstrap.mockResolvedValueOnce({
786787
storyboards: [appHello],
787788
});
@@ -796,6 +797,7 @@ describe("Kernel", () => {
796797
configA: { key2: "value2" },
797798
configB: "valueB",
798799
},
800+
blackList,
799801
});
800802
spyOnCheckLogin.mockResolvedValueOnce({
801803
loggedIn: true,
@@ -820,6 +822,7 @@ describe("Kernel", () => {
820822
configA: { key1: "value1", key2: "value2" },
821823
configB: "valueB",
822824
});
825+
expect(kernel.bootstrapData.storyboards[0].meta.blackList).toBe(blackList);
823826
});
824827

825828
it("should bootstrap for standalone micro-apps, without no auth guard, get runtime failed", async () => {

packages/brick-kit/src/internal/poll.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ export function startPoll(
3232
"continueOnError",
3333
"delegateLoadingBar",
3434
]),
35-
context
35+
context,
36+
true
3637
) as ProviderPollOptions;
3738
const currentRenderId = _internalApiGetRouterRenderId();
3839
let currentTimeoutId: number;

0 commit comments

Comments
 (0)