fix(tests): Adjusted tests to pass properly

Author: Dean Sofer

README.md

@@ -10,8 +10,8 @@ This directive allows you to enhance your select elements with behaviour from th
 
 ## Setup
 
-1. Install **testacular**
-  `$ npm install -g testacular@canary`
+1. Install **karma**
+  `$ npm install -g karma`
 2. Install **bower**
   `$ npm install -g bower`
 4. Install components
@@ -21,7 +21,7 @@ This directive allows you to enhance your select elements with behaviour from th
 
 ## Testing
 
-`$ testacular start test/test.conf.js --browsers=Chrome`
+`$ karma start test/test.conf.js --browsers=Chrome`
 
 # Usage
 

package.json

@@ -3,7 +3,7 @@
   "name": "angular-ui-select2",
   "keywords": ["angular", "angularui", "select2"],
   "description": "AngularUI - The companion suite for AngularJS",
-  "version": "0.1.0",
+  "version": "0.0.2",
   "homepage": "http://angular-ui.github.com",
   "repository": {
     "type": "git",
@@ -16,6 +16,6 @@
   "devDependencies": {
     "grunt-recess": "~0.1.3",
     "async": "0.1.x",
-    "testacular": "~0.5.x"
+    "karma": "~0"
   }
 }

src/select2.js

@@ -83,18 +83,13 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
           // Update valid and dirty statuses
           controller.$parsers.push(function (value) {
             var div = elm.prev()
-            if (controller.$valid) {
-              div.removeClass("ng-invalid").addClass("ng-valid");
-              div.removeClass("ng-invalid-required").addClass("ng-valid-required");
-            }
-            if (!controller.$valid) {
-              div.removeClass("ng-valid").addClass("ng-invalid");
-              div.removeClass("ng-valid-required").addClass("ng-invalid-required");
-            }
-            if (controller.$pristine)
-              div.removeClass("ng-dirty").addClass("ng-pristine");
-            if (controller.$dirty)
-              div.removeClass("ng-pristine").addClass("ng-dirty");
+            div
+              .toggleClass('ng-invalid', !controller.$valid)
+              .toggleClass('ng-valid', controller.$valid)
+              .toggleClass('ng-invalid-required', !controller.$valid)
+              .toggleClass('ng-valid-required', controller.$valid)
+              .toggleClass('ng-dirty', controller.$dirty)
+              .toggleClass('ng-pristine', controller.$pristine);
             return value;
           });
 
@@ -133,9 +128,6 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
           });
         }
 
-        // Set initial value since Angular doesn't
-        //elm.val(scope.$eval(attrs.ngModel));
-
         // Initialize the plugin late so that the injected DOM does not disrupt the template compiler
         $timeout(function () {
           elm.select2(opts);

test/select2Spec.js

@@ -125,39 +125,38 @@ describe('uiSelect2', function () {
           var element = compile('<select ui-select2="{allowClear:true}" ng-model="foo"><option>First</option><option>Second</option></select>');
           expect(element.select2('val')).toBe('First');
           scope.$apply('foo = false');
-          expect(element.select2('val')).toBe(scope.foo);
-          expect(element.select2('val')).toBe(false);
+          expect(element.select2('val')).toBe(null);
+          scope.$apply('foo = "Second"');
           scope.$apply('foo = null');
-          expect(element.select2('val')).toBe(scope.foo);
           expect(element.select2('val')).toBe(null);
+          scope.$apply('foo = "Second"');
           scope.$apply('foo = undefined');
-          expect(element.select2('val')).toBe(scope.foo);
-          expect(element.select2('val')).toBe(undefined);
+          expect(element.select2('val')).toBe(null);
         });
       });
       describe('for multiple select', function(){
         it('should set select2 to multiple value', function(){
-          scope.foo = 'First';
+          scope.foo = ['First'];
           var element = compile('<select ui-select2="{allowClear:true}" multiple ng-model="foo"><option>First</option><option>Second</option><option>Third</option></select>');
           expect(element.select2('val')).toEqual(['First']);
           scope.$apply('foo = ["Second"]');
           expect(element.select2('val')).toEqual(['Second']);
           scope.$apply('foo = ["Second","Third"]');
           expect(element.select2('val')).toEqual(['Second','Third']);
         });
-        it('should set select2 to the value for multiples', function(){
-          scope.foo = 'First';
-          var element = compile('<select ui-select2 multiple ng-model="foo"><option>First</option><option>Second</option><option>Third</option></select>');
-          expect(element.select2('val')).toEqual(['First']);
+        it('should handle falsey values', function(){
+          scope.foo = ['First'];
+          var element = compile('<select ui-select2="{allowClear:true}" multiple ng-model="foo"><option>First</option><option>Second</option><option>Third</option></select>');
+          expect(element.val()).toEqual(['First']);
+          scope.$apply('foo = ["Second"]');
           scope.$apply('foo = false');
-          expect(element.select2('val')).toBe(scope.foo);
-          expect(element.select2('val')).toBe(false);
+          expect(element.select2('val')).toEqual([]);
+          scope.$apply('foo = ["Second"]');
           scope.$apply('foo = null');
-          expect(element.select2('val')).toBe(scope.foo);
-          expect(element.select2('val')).toBe(null);
+          expect(element.select2('val')).toEqual([]);
+          scope.$apply('foo = ["Second"]');
           scope.$apply('foo = undefined');
-          expect(element.select2('val')).toBe(scope.foo);
-          expect(element.select2('val')).toBe(undefined);
+          expect(element.select2('val')).toEqual([]);
         });
       });
     });
@@ -182,8 +181,8 @@ describe('uiSelect2', function () {
       scope.items = ['first', 'second', 'third'];
       scope.foo = 'fourth';
       var element = compile('<select ui-select2 ng-model="foo"><option ng-repeat="item in items">{{item}}</option></select>');
-      expect(element.select2('val')).toNotBe('fourth');
-      scope.$apply('items=["fourth"]');
+      expect(element.select2('val')).toBe(null);
+      scope.$apply('foo="fourth";items=["fourth"]');
       $timeout.flush();
       expect(element.select2('val')).toBe('fourth');
     });