Merge branch 'master' into use-strict-templates-for-real

azerothcore · Mar 22, 2020 · 22e7ec4 · 22e7ec4
2 parents d6c98f2 + 7679d7b
commit 22e7ec4
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 24 deletions.
diff --git a/...app/features/creature/creature-equip-template/creature-equip-template.integration.spec.ts b/...app/features/creature/creature-equip-template/creature-equip-template.integration.spec.ts
@@ -142,12 +142,14 @@ describe('CreatureEquipTemplate integration tests', () => {
       const field = 'ItemID1';
       page.clickElement(page.getSelectorBtn(field));
       page.expectModalDisplayed();
+      await page.whenReady();
 
       page.clickSearchBtn();
-
-      await fixture.whenStable();
+      await page.whenReady();
       page.clickRowOfDatatable(0);
+      await page.whenReady();
       page.clickModalSelect();
+      await page.whenReady();
 
       page.expectDiffQueryToContain(
         'UPDATE `creature_equip_template` SET `ItemID1` = 1200 WHERE (`CreatureID` = 1234);'

diff --git a/...atures/creature/creature-onkill-reputation/creature-onkill-reputation.integration.spec.ts b/...atures/creature/creature-onkill-reputation/creature-onkill-reputation.integration.spec.ts
@@ -143,11 +143,12 @@ describe('CreatureOnkillReputation integration tests', () => {
       const field = 'MaxStanding1';
       page.clickElement(page.getSelectorBtn(field));
       page.expectModalDisplayed();
+      await page.whenReady();
 
       page.clickRowOfDatatable(7);
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('7');
       page.expectDiffQueryToContain(

diff --git a/...app/features/creature/creature-template-addon/creature-template-addon.integration.spec.ts b/...app/features/creature/creature-template-addon/creature-template-addon.integration.spec.ts
@@ -141,12 +141,15 @@ describe('CreatureTemplateAddon integration tests', () => {
     it('changing a value via SingleValueSelector should correctly work', async () => {
       const field = 'bytes1';
       page.clickElement(page.getSelectorBtn(field));
+
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.clickRowOfDatatable(8);
+
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('8');
       page.expectDiffQueryToContain(

diff --git a/src/app/features/creature/creature-template/creature-template.integration.spec.ts b/src/app/features/creature/creature-template/creature-template.integration.spec.ts
@@ -167,12 +167,16 @@ describe('CreatureTemplate integration tests', () => {
       const field = 'unit_flags';
       page.clickElement(page.getSelectorBtn(field));
       page.expectModalDisplayed();
+      await page.whenReady();
 
       page.toggleFlagInRow(2);
+
+      await page.whenReady();
       page.toggleFlagInRow(12);
+
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('4100');
       page.expectDiffQueryToContain(

diff --git a/...atures/gameobject/gameobject-template-addon/gameobject-template-addon.integration.spec.ts b/...atures/gameobject/gameobject-template-addon/gameobject-template-addon.integration.spec.ts
@@ -122,13 +122,15 @@ describe('GameobjectTemplateAddon integration tests', () => {
     it('changing a value via FlagsSelector should correctly work', async () => {
       const field = 'flags';
       page.clickElement(page.getSelectorBtn(field));
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.toggleFlagInRow(1); // +2^1
+      await page.whenReady();
       page.toggleFlagInRow(3); // +2^3
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('10');
       page.expectDiffQueryToContain(

diff --git a/src/app/features/gameobject/gameobject-template/gameobject-template.integration.spec.ts b/src/app/features/gameobject/gameobject-template/gameobject-template.integration.spec.ts
@@ -142,12 +142,13 @@ describe('GameobjectTemplate integration tests', () => {
     it('changing a value via SingleValueSelector should correctly work', async () => {
       const field = 'type';
       page.clickElement(page.getSelectorBtn(field));
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.clickRowOfDatatable(7);
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('7');
       page.expectDiffQueryToContain(

diff --git a/src/app/features/item/item-template/item-template.integration.spec.ts b/src/app/features/item/item-template/item-template.integration.spec.ts
@@ -171,13 +171,16 @@ describe('ItemTemplate integration tests', () => {
     it('changing a value via FlagsSelector should correctly work', async () => {
       const field = 'Flags';
       page.clickElement(page.getSelectorBtn(field));
+
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.toggleFlagInRow(2);
+      await page.whenReady();
       page.toggleFlagInRow(12);
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('4100');
       page.expectDiffQueryToContain(

diff --git a/src/app/features/quest/quest-offer-reward/quest-offer-reward.integration.spec.ts b/src/app/features/quest/quest-offer-reward/quest-offer-reward.integration.spec.ts
@@ -147,12 +147,15 @@ describe('QuestOfferReward integration tests', () => {
     it('changing a value via SingleValueSelector should correctly work', async () => {
       const field = 'Emote1';
       page.clickElement(page.getSelectorBtn(field));
+
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.clickRowOfDatatable(4);
+
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('4');
       page.expectDiffQueryToContain(

diff --git a/src/app/features/quest/quest-request-items/quest-request-items.integration.spec.ts b/src/app/features/quest/quest-request-items/quest-request-items.integration.spec.ts
@@ -137,12 +137,13 @@ describe('QuestRequestItems integration tests', () => {
     it('changing a value via SingleValueSelector should correctly work', async () => {
       const field = 'EmoteOnComplete';
       page.clickElement(page.getSelectorBtn(field));
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.clickRowOfDatatable(4);
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('4');
       page.expectDiffQueryToContain(

diff --git a/src/app/features/quest/quest-template-addon/quest-template-addon.integration.spec.ts b/src/app/features/quest/quest-template-addon/quest-template-addon.integration.spec.ts
@@ -172,13 +172,15 @@ describe('QuestTemplateAddon integration tests', () => {
     it('changing a value via FlagsSelector should correctly work', async () => {
       const field = 'SpecialFlags';
       page.clickElement(page.getSelectorBtn(field));
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.toggleFlagInRow(1);
+      await page.whenReady();
       page.toggleFlagInRow(3);
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('10');
       page.expectDiffQueryToContain(
@@ -205,13 +207,16 @@ describe('QuestTemplateAddon integration tests', () => {
       ));
 
       page.clickElement(page.getSelectorBtn(field));
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.clickSearchBtn();
 
       await fixture.whenStable();
       page.clickRowOfDatatable(0);
+      await page.whenReady();
       page.clickModalSelect();
+      await page.whenReady();
 
       page.expectDiffQueryToContain(
         'UPDATE `quest_template_addon` SET `SourceSpellID` = 123 WHERE (`ID` = 1234);'

diff --git a/src/app/features/quest/quest-template/quest-template.integration.spec.ts b/src/app/features/quest/quest-template/quest-template.integration.spec.ts
@@ -168,13 +168,15 @@ describe('QuestTemplate integration tests', () => {
     it('changing a value via FlagsSelector should correctly work', async () => {
       const field = 'Flags';
       page.clickElement(page.getSelectorBtn(field));
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.toggleFlagInRow(2);
+      await page.whenReady();
       page.toggleFlagInRow(12);
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('4100');
       page.expectDiffQueryToContain(

diff --git a/src/app/shared/modules/sai-editor/sai-editor.component.integration.spec.ts b/src/app/shared/modules/sai-editor/sai-editor.component.integration.spec.ts
@@ -400,14 +400,17 @@ describe('SaiEditorComponent integration tests', () => {
     it('changing a value via FlagsSelector should correctly work', async () => {
       const field = 'event_flags';
       page.clickRowOfDatatable(0);
+      await page.whenReady();
       page.clickElement(page.getSelectorBtn(field));
+      await page.whenReady();
       page.expectModalDisplayed();
 
       page.toggleFlagInRow(1); // +2^1
+      await page.whenReady();
       page.toggleFlagInRow(3); // +2^3
+      await page.whenReady();
       page.clickModalSelect();
-      await fixture.whenStable();
-      await fixture.whenRenderingDone();
+      await page.whenReady();
 
       expect(page.getInputById(field).value).toEqual('10');
       page.expectDiffQueryToContain(

diff --git a/src/app/shared/testing/page-object.ts b/src/app/shared/testing/page-object.ts
@@ -16,6 +16,11 @@ export abstract class PageObject<ComponentType> {
     return this.fixture.whenStable();
   }
 
+  async whenReady() {
+    await this.fixture.whenStable();
+    await this.fixture.whenRenderingDone();
+  }
+
   detectChanges() {
     this.fixture.detectChanges();
   }