amend(ionTab): fix tests for class attribute

ionic-team · Jun 11, 2014 · a034561 · a034561
1 parent 30a3c8e
commit a034561
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/js/angular/directive/tab.js b/js/angular/directive/tab.js
@@ -64,7 +64,7 @@ function($rootScope, $animate, $ionicBind, $compile) {
         attrStr('icon-off', attr.iconOff) +
         attrStr('badge', attr.badge) +
         attrStr('badge-style', attr.badgeStyle) +
-        attrStr('class', attr.class) +
+        attrStr('class', attr['class']) +
         '></ion-tab-nav>';
 
       //Remove the contents of the element so we can compile them later, if tab is selected

diff --git a/js/angular/directive/tabNav.js b/js/angular/directive/tabNav.js
@@ -6,7 +6,7 @@ IonicModule
     require: ['^ionTabs', '^ionTab'],
     template:
     '<a ng-class="{\'tab-item-active\': isTabActive(), \'has-badge\':badge}" ' +
-      ' class="tab-item {{class}}">' +
+      ' class="tab-item">' +
       '<span class="badge {{badgeStyle}}" ng-if="badge">{{badge}}</span>' +
       '<i class="icon {{getIconOn()}}" ng-if="getIconOn() && isTabActive()"></i>' +
       '<i class="icon {{getIconOff()}}" ng-if="getIconOff() && !isTabActive()"></i>' +
@@ -19,7 +19,7 @@ IonicModule
       iconOff: '@',
       badge: '=',
       badgeStyle: '@',
-      class: '@'
+      'class': '@'
     },
     compile: function(element, attr, transclude) {
       return function link($scope, $element, $attrs, ctrls) {

diff --git a/test/unit/angular/directive/tabs.unit.js b/test/unit/angular/directive/tabs.unit.js
@@ -397,7 +397,7 @@ describe('tabs', function() {
         c: 'off',
         d: 6,
         e: 'badger',
-        f: 'class'
+        f: 'someClass'
       });
       tabEl.scope().$apply();
       var navItem = angular.element(tabsEl[0].querySelector('.tab-item'));
@@ -406,7 +406,7 @@ describe('tabs', function() {
       expect(navItem.isolateScope().iconOff).toEqual('off');
       expect(navItem.isolateScope().badge).toEqual(6);
       expect(navItem.isolateScope().badgeStyle).toEqual('badger');
-      expect(navItem.isolateScope().class).toEqual('class');
+      expect(navItem[0].className).toMatch(/someClass/);
       expect(navItem.attr('ng-click')).toEqual('click');
 
       angular.extend(tabEl.scope(), {
@@ -415,15 +415,15 @@ describe('tabs', function() {
         c: 'off2',
         d: 7,
         e: 'badger2',
-        f: 'class2'
+        f: 'someClass2'
       });
       tabEl.scope().$apply();
       expect(navItem.isolateScope().title).toEqual('title2');
       expect(navItem.isolateScope().iconOn).toEqual('on2');
       expect(navItem.isolateScope().iconOff).toEqual('off2');
       expect(navItem.isolateScope().badge).toEqual(7);
       expect(navItem.isolateScope().badgeStyle).toEqual('badger2');
-      expect(navItem.isolateScope().class).toEqual('class2');
+      expect(navItem[0].className).toMatch(/someClass2/);
 
       expect(navItem.parent()[0]).toBe(tabsCtrl.$tabsElement[0]);
     });