Arthur Bogaart pushed to branch feature/angularjs-downgrade at cms-community /
hippo-addon-channel-manager
Commits:
1b3e6138 by Arthur Bogaart at 2018-01-10T00:41:42+01:00
CHANNELMGR-1635 Fix lint errors
- - - - -
e0f3811e by Arthur Bogaart at 2018-01-10T00:42:08+01:00
CHANNELMGR-1635 Fix showError arguments
- - - - -
4 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/nameUrlFields/nameUrlFields.controller.spec.js
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
Changes:
=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts
=====================================
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts
@@ -75,16 +75,6 @@ export class ContentServiceMock {
}
}
-export class DialogServiceMock {
- confirm(): any {
- return new ConfirmDialogMock();
- }
-
- show(dialog: object): Promise<void> {
- return Promise.resolve();
- }
-}
-
export class ConfirmDialogMock {
title() {
return this;
@@ -103,22 +93,32 @@ export class ConfirmDialogMock {
}
}
-export class FieldServiceMock {
- setDocumentId(id: string): void {}
-}
+export class DialogServiceMock {
+ confirm(): any {
+ return new ConfirmDialogMock();
+ }
-export class MdDialogMock {
- open() {
- return new MdDialogRefMock();
+ show(dialog: object): Promise<void> {
+ return Promise.resolve();
}
}
+export class FieldServiceMock {
+ setDocumentId(id: string): void {}
+}
+
export class MdDialogRefMock {
afterClosed () {
return Observable.of({ name: 'docName', url: 'doc-url' });
}
}
+export class MdDialogMock {
+ open() {
+ return new MdDialogRefMock();
+ }
+}
+
export class ChannelServiceMock {
getChannel() {
return {
=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/nameUrlFields/nameUrlFields.controller.spec.js
=====================================
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/nameUrlFields/nameUrlFields.controller.spec.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/nameUrlFields/nameUrlFields.controller.spec.js
@@ -20,11 +20,9 @@ describe('NameUrlFields', () => {
let $componentController;
let $q;
let $rootScope;
- let $timeout;
let CreateContentService;
let component;
- let scope;
let element;
const spies = {};
@@ -35,11 +33,10 @@ describe('NameUrlFields', () => {
$componentController = _$componentController_;
$q = _$q_;
$rootScope = _$rootScope_;
- $timeout = _$timeout_;
CreateContentService = _CreateContentService_;
});
- scope = $rootScope.$new();
+ $rootScope.$new();
// element = angular.element('<hippo-name-url-fields
name-field="nameField" url-field="urlField"
locale="locale"></hippo-name-url-fields>');
element = angular.element('<form><input ng-model="$ctrl.nameField"
name="name" placeholder="Document name" required autocomplete="off"
id="nameInputElement"></form>');
component = $componentController('nameUrlFields', {
@@ -58,7 +55,7 @@ describe('NameUrlFields', () => {
component.nameField = '';
});
- function setNameInputValue (value) {
+ function setNameInputValue(value) {
component.nameInputField.val(value);
component.nameField = value;
component.nameInputField.trigger('keyup');
@@ -85,7 +82,7 @@ describe('NameUrlFields', () => {
currentValue: component.locale,
previousValue: 'en',
isFirstChange: () => false,
- }
+ },
};
component.$onChanges(changes);
expect(component.setDocumentUrlByName).toHaveBeenCalled();
=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
=====================================
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
@@ -275,7 +275,7 @@ describe('Create content step 2 component', () => {
expect(deleteDraftSpy).toHaveBeenCalledWith(testDocument.id);
expect(feedbackService.showError).toHaveBeenCalledWith('ERROR_TEST', {});
- }))
+ }));
});
describe('saveDocument', () => {
=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
=====================================
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
@@ -111,7 +111,9 @@ class RightSidePanelCtrl {
_onError(error, genericMessage) {
if (error.data && error.data.reason) {
const errorKey = this.$translate.instant(`ERROR_${error.data.reason}`);
- this.FeedbackService.showError(errorKey, error.data.params);
+ const args = [errorKey];
+ if (error.data.params) args.push(error.data.params);
+ this.FeedbackService.showError(...args);
} else {
this.$log.error(genericMessage, error);
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/6ce43a61513581c9417363dc50df063a5074631b...e0f3811e8c30c6b129b252396fb36811841eef76
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/6ce43a61513581c9417363dc50df063a5074631b...e0f3811e8c30c6b129b252396fb36811841eef76
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
