Add tests for shorthand options

Author: davej

test/controllers/options.js

@@ -7,7 +7,7 @@ angular.module('options-classy', ['classy']).classy.options.controller = {
     addToScope: false,
     addToClass: false
   }
-}
+};
 
 angular.module('options-classy').classy.controller({
   name: 'optionsOne',
@@ -67,3 +67,62 @@ angular.module('options-classy').classy.controller({
     }
   }
 });
+
+
+angular.module('options-classy-shorthand', ['classy']).classy.options.controller = {
+  addToScope: false,
+  addToClass: false
+};
+
+angular.module('options-classy-shorthand').classy.controller({
+  name: 'optionsOne',
+  inject: ['$scope'],
+
+  data: {
+    foo: '"foo"',
+    bar: '"bar"'
+  },
+
+  init: function() {
+    this.baz = 'baz';
+    this.$.baz = 'baz';
+  },
+
+  methods: {
+    fooMethod: function() {
+      return;
+    },
+    barMethod: function() {
+      return;
+    }
+  }
+});
+
+angular.module('options-classy-shorthand').classy.controller({
+  name: 'optionsTwo',
+  // Override module options
+  __options: {
+    addToScope: true,
+    addToClass: false
+  },
+  inject: ['$scope'],
+
+  data: {
+    foo: '"foo"',
+    bar: '"bar"'
+  },
+
+  init: function() {
+    this.baz = 'baz';
+    this.$.baz = 'baz';
+  },
+
+  methods: {
+    fooMethod: function() {
+      return;
+    },
+    barMethod: function() {
+      return;
+    }
+  }
+});

test/unit/optionsSpec.js

@@ -50,15 +50,15 @@
         ctrl = $controller(ctrlName, { $scope: scope });
       }));
 
-      it('should not have any properties from data', function () {
+      it('should have `data` properties on scope but not directly on controller', function () {
         expect(scope.foo).toBeDefined();
         expect(ctrl.foo).toBeUndefined();
 
         expect(scope.bar).toBeDefined();
         expect(ctrl.bar).toBeUndefined();
       });
 
-      it('should not have any properties from methods', function () {
+      it('should not have methods on scope but does have methods directly on controller', function () {
         expect(scope.fooMethod).toBeUndefined();
         expect(ctrl.fooMethod).toBeDefined();
 
@@ -78,4 +78,81 @@
 
   });
 
+  describe('Classy Plugin Options', function () {
+
+    beforeEach(module('options-classy-shorthand'));
+
+    describe('first controller', function() {
+      var ctrl, scope;
+      var ctrlName = 'optionsOne';
+
+      beforeEach(inject(function ($controller, $rootScope) {
+        scope = $rootScope.$new();
+        ctrl = $controller(ctrlName, { $scope: scope });
+      }));
+
+      it('should not have any properties from data', function () {
+        expect(scope.foo).toBeUndefined();
+        expect(ctrl.foo).toBeUndefined();
+
+        expect(scope.bar).toBeUndefined();
+        expect(ctrl.bar).toBeUndefined();
+      });
+
+      it('should not have any properties from methods', function () {
+        expect(scope.fooMethod).toBeUndefined();
+        expect(ctrl.fooMethod).toBeUndefined();
+
+        expect(scope.barMethod).toBeUndefined();
+        expect(ctrl.barMethod).toBeUndefined();
+      });
+
+
+      it('should have `baz` property on scope and class', function () {
+        expect(scope.baz).toBeDefined();
+        expect(ctrl.baz).toBeDefined();
+      });
+
+
+    });
+
+
+    describe('second controller', function() {
+      var ctrl, scope;
+      var ctrlName = 'optionsTwo';
+
+      beforeEach(inject(function ($controller, $rootScope) {
+        scope = $rootScope.$new();
+        ctrl = $controller(ctrlName, { $scope: scope });
+      }));
+
+      it('should have `data` properties on scope but not directly on controller', function () {
+        expect(scope.foo).toBeDefined();
+        expect(ctrl.foo).toBeUndefined();
+
+        expect(scope.bar).toBeDefined();
+        expect(ctrl.bar).toBeUndefined();
+      });
+
+      it('should have methods on scope but not directly on controller', function () {
+        expect(scope.fooMethod).toBeDefined();
+        expect(ctrl.fooMethod).toBeUndefined();
+
+        expect(scope.barMethod).toBeDefined();
+        expect(ctrl.barMethod).toBeUndefined();
+      });
+
+
+      it('should have `baz` property on scope and class', function () {
+        expect(scope.baz).toBeDefined();
+        expect(ctrl.baz).toBeDefined();
+      });
+
+
+    });
+
+
+  });
+
+
 }());