Update package.json dependencies, refactor tests to use Jasmine 2.0

Author: wesleycho

gruntFile.js

@@ -7,17 +7,15 @@ module.exports = function (grunt) {
   grunt.registerTask('default', ['jshint', 'karma']);
 
   var karmaConfig = function(configFile, customOptions) {
-    var options = { configFile: configFile, keepalive: true };
+    var options = { configFile: configFile, singleRun: true };
     var travisOptions = process.env.TRAVIS && { browsers: ['Firefox'], reporters: 'dots' };
     return grunt.util._.extend(options, customOptions, travisOptions);
   };
 
   // Project configuration.
   grunt.initConfig({
     karma: {
-      unit: {
-        options: karmaConfig('test/test.conf.js')
-      }
+      unit: karmaConfig('test/karma.conf.js')
     },
     jshint:{
       files:['src/**/*.js', 'test/**/*.js', 'demo/**/*.js'],

package.json

@@ -8,9 +8,11 @@
   "main": "src/tinymce.js",
   "dependencies": {},
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-karma": "~0.4.4",
-    "grunt-contrib-jshint": "~0.2.0"
+    "grunt": "~0.4.4",
+    "grunt-karma": "~0.8.2",
+    "grunt-contrib-jshint": "~0.10.0",
+    "karma-jasmine": "~0.2.2",
+    "karma-chrome-launcher": "~0.1.3"
   },
   "scripts": {},
   "repository": {

test/karma.conf.js

@@ -0,0 +1,17 @@
+module.exports = function (config) {
+  config.set({
+    basePath: '..',
+    frameworks: ['jasmine'],
+    files: [
+      'bower_components/angular/angular.js',
+      'bower_components/angular-mocks/angular-mocks.js',
+      'bower_components/tinymce/tinymce.min.js',
+      'src/tinymce.js',
+      {pattern: 'bower_components/tinymce/themes/modern/theme.min.js', served: true},
+      'test/*.spec.js'
+    ],
+    singleRun: false,
+    autoWatch: true,
+    browsers: [ 'Chrome' ],
+  });
+};

test/test.conf.js

@@ -22,49 +22,53 @@ describe('uiTinymce', function () {
    * Asynchronously runs the compilation.
    */
   function compile() {
-    runs(function () {
-      element = $compile('<form><textarea id="foo" ui-tinymce="{foo: \'bar\', setup: setupFooBar() }" ng-model="foo"></textarea></form>')(scope);
-      angular.element(document.getElementsByTagName('body')[0]).append(element);
-    });
+    element = $compile('<form><textarea id="foo" ui-tinymce="{foo: \'bar\', setup: setupFooBar() }" ng-model="foo"></textarea></form>')(scope);
+    angular.element(document.getElementsByTagName('body')[0]).append(element);
     scope.$apply();
-    waits(1);
   }
 
   describe('compiling this directive', function () {
 
-    it('should include the passed options', function () {
+    it('should include the passed options', function (done) {
       spyOn(tinymce, 'init');
       compile();
-      runs(function () {
+      setTimeout(function () {
         expect(tinymce.init).toHaveBeenCalled();
-        expect(tinymce.init.mostRecentCall.args[0].foo).toEqual('bar');
+        expect(tinymce.init.calls.mostRecent().args[0].foo).toBe('bar');
+        done();
       });
     });
 
-    it('should include the default options', function () {
+    it('should include the default options', function (done) {
       spyOn(tinymce, 'init');
       compile();
-      runs(function () {
+      setTimeout(function () {
         expect(tinymce.init).toHaveBeenCalled();
-        expect(tinymce.init.mostRecentCall.args[0].tinymce.bar).toEqual('baz');
+        expect(tinymce.init.calls.mostRecent().args[0].tinymce.bar).toBe('baz');
+        done();
       });
     });
 
-    it('should execute the passed `setup` option', function () {
+    it('should execute the passed `setup` option', function (done) {
       scope.setupFooBar = jasmine.createSpy('setupFooBar');
       compile();
-      runs(function () {
+      setTimeout(function () {
         expect(scope.setupFooBar).toHaveBeenCalled();
+        done();
       });
     });
   });
 
-  it('should remove tinymce instance on $scope destruction', function () {
+  it('should remove tinymce instance on $scope destruction', function (done) {
     compile();
-    runs(function () {
+    setTimeout(function () {
       expect(tinymce.get('foo')).toBeTruthy();
+
       scope.$destroy();
+
       expect(tinymce.get('foo')).toBeUndefined();
+
+      done();
     });
   });
   /*