From f63bcc0fdc17fdb57facbef56cbc3a1250369bd2 Mon Sep 17 00:00:00 2001
From: jliddev <jliddev@gmail.com>
Date: Mon, 14 Dec 2020 14:32:47 -0600
Subject: [PATCH] Version bump

Fix test issues
---
 wowup-electron/package.json                   |  2 +-
 .../install-from-url-dialog.component.ts      |  4 +-
 .../options-debug-section.component.html      |  5 ++-
 .../options-debug-section.component.spec.ts   | 44 +++++++++++--------
 .../src/app/services/addons/addon.service.ts  |  3 +-
 wowup-electron/src/assets/changelog.json      | 12 +++++
 6 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/wowup-electron/package.json b/wowup-electron/package.json
index d79dab2b..3bd4e68c 100644
--- a/wowup-electron/package.json
+++ b/wowup-electron/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wowup",
   "productName": "WowUp",
-  "version": "2.1.0-beta.6",
+  "version": "2.1.0-beta.7",
   "description": "Word of Warcraft addon updater",
   "homepage": "https://wowup.io",
   "author": {
diff --git a/wowup-electron/src/app/components/install-from-url-dialog/install-from-url-dialog.component.ts b/wowup-electron/src/app/components/install-from-url-dialog/install-from-url-dialog.component.ts
index ca5e5d2a..f529ea05 100644
--- a/wowup-electron/src/app/components/install-from-url-dialog/install-from-url-dialog.component.ts
+++ b/wowup-electron/src/app/components/install-from-url-dialog/install-from-url-dialog.component.ts
@@ -9,7 +9,7 @@ import { AlertDialogComponent } from "../alert-dialog/alert-dialog.component";
 import { TranslateService } from "@ngx-translate/core";
 import { roundDownloadCount, shortenDownloadCount } from "../../utils/number.utils";
 import { DownloadCountPipe } from "../../pipes/download-count.pipe";
-import { NO_SEARCH_RESULTS_ERROR } from "common/constants";
+import { NO_SEARCH_RESULTS_ERROR } from "../../../common/constants";
 
 @Component({
   selector: "app-install-from-url-dialog",
@@ -120,7 +120,7 @@ export class InstallFromUrlDialogComponent implements OnInit, OnDestroy {
       } else if (err.code && err.code === "EOPENBREAKER") {
         // Provider circuit breaker is open
         message = this._translateService.instant("DIALOGS.INSTALL_FROM_URL.ERROR.FAILED_TO_CONNECT");
-      } else if(message === NO_SEARCH_RESULTS_ERROR){
+      } else if (message === NO_SEARCH_RESULTS_ERROR) {
         message = this._translateService.instant("DIALOGS.INSTALL_FROM_URL.ERROR.NO_SEARCH_RESULTS");
       }
 
diff --git a/wowup-electron/src/app/components/options-debug-section/options-debug-section.component.html b/wowup-electron/src/app/components/options-debug-section/options-debug-section.component.html
index 5cd616b8..400f43e0 100644
--- a/wowup-electron/src/app/components/options-debug-section/options-debug-section.component.html
+++ b/wowup-electron/src/app/components/options-debug-section/options-debug-section.component.html
@@ -10,7 +10,7 @@
         <small class="text-2">{{ "PAGES.OPTIONS.DEBUG.LOG_FILES_DESCRIPTION" | translate }}</small>
       </div>
       <div>
-        <button mat-flat-button color="primary" (click)="onShowLogs()">
+        <button id="show-log-btn" mat-flat-button color="primary" (click)="onShowLogs()">
           {{ "PAGES.OPTIONS.DEBUG.LOG_FILES_BUTTON" | translate }}
         </button>
       </div>
@@ -24,7 +24,8 @@
         <small class="text-2">{{ "PAGES.OPTIONS.DEBUG.DEBUG_DATA_DESCRIPTION" | translate }}</small>
       </div>
       <div>
-        <button mat-flat-button color="primary" (click)="onLogDebugData()" [disabled]="dumpingDebugData === true">
+        <button id="dump-debug-btn" mat-flat-button color="primary" (click)="onLogDebugData()"
+          [disabled]="dumpingDebugData === true">
           <span *ngIf="dumpingDebugData === false">{{ "PAGES.OPTIONS.DEBUG.DEBUG_DATA_BUTTON" | translate }}</span>
           <div *ngIf="dumpingDebugData === true" [style.height]="'37px'" [style.width]="'100px'"
             class="row align-items-center justify-content-center">
diff --git a/wowup-electron/src/app/components/options-debug-section/options-debug-section.component.spec.ts b/wowup-electron/src/app/components/options-debug-section/options-debug-section.component.spec.ts
index 55e54278..6adb81af 100644
--- a/wowup-electron/src/app/components/options-debug-section/options-debug-section.component.spec.ts
+++ b/wowup-electron/src/app/components/options-debug-section/options-debug-section.component.spec.ts
@@ -21,24 +21,30 @@ describe("OptionsDebugSectionComponent", () => {
 
     await TestBed.configureTestingModule({
       declarations: [OptionsDebugSectionComponent],
-      imports: [HttpClientModule, TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useFactory: httpLoaderFactory,
-          deps: [HttpClient],
+      imports: [
+        HttpClientModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useFactory: httpLoaderFactory,
+            deps: [HttpClient],
+          },
+          compiler: {
+            provide: TranslateCompiler,
+            useClass: TranslateMessageFormatCompiler,
+          },
+        }),
+      ],
+    })
+      .overrideComponent(OptionsDebugSectionComponent, {
+        set: {
+          providers: [
+            { provide: AddonService, useValue: addonServiceSpy },
+            { provide: WowUpService, useValue: wowUpServiceSpy },
+          ],
         },
-        compiler: {
-          provide: TranslateCompiler,
-          useClass: TranslateMessageFormatCompiler,
-        },
-      })],
-    }).overrideComponent(OptionsDebugSectionComponent, {
-      set: {
-      providers: [
-          { provide: AddonService, useValue: addonServiceSpy },
-          { provide: WowUpService, useValue: wowUpServiceSpy },
-      ]},
-    }).compileComponents();
+      })
+      .compileComponents();
 
     fixture = TestBed.createComponent(OptionsDebugSectionComponent);
     component = fixture.componentInstance;
@@ -53,14 +59,14 @@ describe("OptionsDebugSectionComponent", () => {
   });
 
   it("Should call logDebugData", fakeAsync(() => {
-    const button = fixture.debugElement.nativeElement.querySelector("button[action='LogDebugData']");
+    const button = fixture.debugElement.nativeElement.querySelector("#dump-debug-btn");
     button.click();
     tick();
     expect(addonServiceSpy.logDebugData).toHaveBeenCalled();
   }));
 
   it("Should call showLogFiles", fakeAsync(() => {
-    const button = fixture.debugElement.nativeElement.querySelector("button[action='ShowLogFiles']");
+    const button = fixture.debugElement.nativeElement.querySelector("#show-log-btn");
     button.click();
     tick();
     expect(wowUpServiceSpy.showLogsFolder).toHaveBeenCalled();
diff --git a/wowup-electron/src/app/services/addons/addon.service.ts b/wowup-electron/src/app/services/addons/addon.service.ts
index c1658c4d..95283218 100644
--- a/wowup-electron/src/app/services/addons/addon.service.ts
+++ b/wowup-electron/src/app/services/addons/addon.service.ts
@@ -40,8 +40,7 @@ import { WarcraftService } from "../warcraft/warcraft.service";
 import { WowUpService } from "../wowup/wowup.service";
 import { AddonProviderFactory } from "./addon.provider.factory";
 import { AddonFolder } from "../../models/wowup/addon-folder";
-import { InstallError } from "../../errors";
-import { WowUpAddonProvider } from "app/addon-providers/wowup-addon-provider";
+import { WowUpAddonProvider } from "../../addon-providers/wowup-addon-provider";
 
 export enum ScanUpdateType {
   Start,
diff --git a/wowup-electron/src/assets/changelog.json b/wowup-electron/src/assets/changelog.json
index c1694823..2d2952fb 100644
--- a/wowup-electron/src/assets/changelog.json
+++ b/wowup-electron/src/assets/changelog.json
@@ -1,5 +1,17 @@
 {
   "ChangeLogs": [
+    {
+      "Version": "2.1.0-beta.7",
+      "changes": [
+        "Use new icon for mac build (alphabitnz)",
+        "Some addon providers can no longer be turned off",
+        "Add better error handling for install/update errors",
+        "Add a new error description when importing from URL",
+        "Move debug option to the bottom of the list",
+        "Fix missing version number in About page",
+        "Improve the dump debug button to include new Hub provider"
+      ]
+    },
     {
       "Version": "2.1.0-beta.6",
       "changes": [