Canh Ngo pushed to branch feature/cmng-psp1-CHANNELMGR-499 at cms-community / 
hippo-addon-channel-manager


Commits:
06759606 by Canh Ngo at 2016-04-11T17:32:43+02:00
CHANNELMGR-499: improved experiment-label directive

Verified 'has-icon' class in unit-test

- - - - -


3 changed files:

- frontend-ng/src/angularjs/channel/relevance/experimentLabel.controller.js
- frontend-ng/src/angularjs/channel/relevance/experimentLabel.directive.js
- frontend-ng/src/angularjs/channel/relevance/experimentLabel.directive.spec.js


Changes:

=====================================
frontend-ng/src/angularjs/channel/relevance/experimentLabel.controller.js
=====================================
--- a/frontend-ng/src/angularjs/channel/relevance/experimentLabel.controller.js
+++ b/frontend-ng/src/angularjs/channel/relevance/experimentLabel.controller.js
@@ -26,7 +26,6 @@ export class ExperimentLabelCtrl {
 
     if (this.hasExperiment()) {
       $attrs.experimentState = this._getExperimentState();
-      $element.addClass('has-icon');
     }
   }
 


=====================================
frontend-ng/src/angularjs/channel/relevance/experimentLabel.directive.js
=====================================
--- a/frontend-ng/src/angularjs/channel/relevance/experimentLabel.directive.js
+++ b/frontend-ng/src/angularjs/channel/relevance/experimentLabel.directive.js
@@ -28,6 +28,7 @@ export function ExperimentLabelDirective() {
       // override component label
       if (attrs.experimentState) {
         element.find('.overlay-label-text').text(attrs.experimentState);
+        element.addClass('has-icon');
       }
     },
   };


=====================================
frontend-ng/src/angularjs/channel/relevance/experimentLabel.directive.spec.js
=====================================
--- 
a/frontend-ng/src/angularjs/channel/relevance/experimentLabel.directive.spec.js
+++ 
b/frontend-ng/src/angularjs/channel/relevance/experimentLabel.directive.spec.js
@@ -66,6 +66,7 @@ describe('ExperimentLabelDirective', () => {
     compileDirective();
 
     expect($element.find('.overlay-label-text').text()).toBe('label text');
+    expect($element.hasClass('has-icon')).toBe(false);
     expect($translate.instant).not.toHaveBeenCalled();
   });
 
@@ -74,6 +75,7 @@ describe('ExperimentLabelDirective', () => {
     compileDirective();
 
     expect($element.find('.overlay-label-text').text()).toBe('label text');
+    expect($element.hasClass('has-icon')).toBe(false);
     expect($translate.instant).not.toHaveBeenCalled();
   });
 
@@ -81,9 +83,10 @@ describe('ExperimentLabelDirective', () => {
     $translate.instant.and.returnValue('experiment-label');
     compileDirective();
 
+    expect($element.hasClass('has-icon')).toBe(true);
     const iconEl = $element.find('md-icon');
     expect(iconEl).toBeDefined();
-    expect(iconEl.hasClass('overlay-label-icon')).toBeDefined();
+    expect(iconEl.hasClass('overlay-label-icon')).toBe(true);
     expect(iconEl.text()).toBe('toys');
 
     
expect($element.find('.overlay-label-text').text()).toBe('experiment-label');



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/0675960640f67481ce19a4bd8a72be84f722dbcd
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

Reply via email to