From c808faced55b3886c59fec7ea8a83cd3b9fba2ee Mon Sep 17 00:00:00 2001 From: ajinkya007 Date: Sat, 2 Jul 2016 18:18:51 +0530 Subject: [PATCH 1/5] Add javascript dependencies in the bower.json --- bower.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index f5d10c0..2bd074b 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,5 @@ { - "name": "CommunityCalendar", + "name": "bower", "version": "0.1", "private": true, "ignore": [ @@ -11,6 +11,9 @@ ], "dependencies": { "angular": "", - "angular-route": "~1.4.8" + "angular-route": "~1.4.8", + "angular-ui-router": "", + "angular-bootstrap": "", + "bootstrap": "" } } From 307c5c8d1192f61e6148ba9d1ff1f3fb2c63cfb9 Mon Sep 17 00:00:00 2001 From: ajinkya007 Date: Sat, 2 Jul 2016 18:25:18 +0530 Subject: [PATCH 2/5] Add the node dependencies in the package.json --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 56b857e..182b929 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,10 @@ "body-parser": "", "serve-static": "", "errorhandler": "", - "bower": "" + "bower": "", + "jasmine-node": "", + "frisby": "", + "karma": "" }, "production_dirs": { "coffee_src": "src/", From 04fbc3df16a7c5c6086edc33474674eac049055d Mon Sep 17 00:00:00 2001 From: ajinkya007 Date: Sat, 2 Jul 2016 19:15:17 +0530 Subject: [PATCH 3/5] Add the angular-mocks.js for running the e2e tests. --- test/e2e/runner.html | 1 + test/e2e/seed-runner.html | 1 + 2 files changed, 2 insertions(+) diff --git a/test/e2e/runner.html b/test/e2e/runner.html index eca443c..9f241af 100644 --- a/test/e2e/runner.html +++ b/test/e2e/runner.html @@ -4,6 +4,7 @@ End2end Test Runner + diff --git a/test/e2e/seed-runner.html b/test/e2e/seed-runner.html index 9ed5528..e5a8b3c 100644 --- a/test/e2e/seed-runner.html +++ b/test/e2e/seed-runner.html @@ -4,6 +4,7 @@ End2end Test Runner + From b9ec6a3bc996bf96190bd687f4e12262a655a6fa Mon Sep 17 00:00:00 2001 From: ajinkya007 Date: Thu, 7 Jul 2016 13:38:02 +0530 Subject: [PATCH 4/5] Add support for running tests from npm test command. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 182b929..5a10649 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "devDependencies": { }, "scripts": { - "postinstall": "bower install" + "postinstall": "bower install", + "test": "jasmine-node --verbose test" } } From a8f33b498fcca269c47190903ec89a1ba49154a2 Mon Sep 17 00:00:00 2001 From: ajinkya007 Date: Thu, 7 Jul 2016 13:40:29 +0530 Subject: [PATCH 5/5] Remove the files from test/unit as they are unrelated. --- test/unit/controllersSpec.js | 16 ---------------- test/unit/directivesSpec.js | 19 ------------------- test/unit/filtersSpec.js | 19 ------------------- test/unit/servicesSpec.coffee | 7 ------- 4 files changed, 61 deletions(-) delete mode 100644 test/unit/controllersSpec.js delete mode 100644 test/unit/directivesSpec.js delete mode 100644 test/unit/filtersSpec.js delete mode 100644 test/unit/servicesSpec.coffee diff --git a/test/unit/controllersSpec.js b/test/unit/controllersSpec.js deleted file mode 100644 index 23f6b09..0000000 --- a/test/unit/controllersSpec.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -/* jasmine specs for controllers go here */ - -describe('controllers', function(){ - beforeEach(module('myApp.controllers')); - - - it('should ....', inject(function() { - //spec body - })); - - it('should ....', inject(function() { - //spec body - })); -}); diff --git a/test/unit/directivesSpec.js b/test/unit/directivesSpec.js deleted file mode 100644 index 6061842..0000000 --- a/test/unit/directivesSpec.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict'; - -/* jasmine specs for directives go here */ - -describe('directives', function() { - beforeEach(module('myApp.directives')); - - describe('app-version', function() { - it('should print current version', function() { - module(function($provide) { - $provide.value('version', 'TEST_VER'); - }); - inject(function($compile, $rootScope) { - var element = $compile('')($rootScope); - expect(element.text()).toEqual('TEST_VER'); - }); - }); - }); -}); diff --git a/test/unit/filtersSpec.js b/test/unit/filtersSpec.js deleted file mode 100644 index 19af329..0000000 --- a/test/unit/filtersSpec.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict'; - -/* jasmine specs for filters go here */ - -describe('filter', function() { - beforeEach(module('myApp.filters')); - - - describe('interpolate', function() { - beforeEach(module(function($provide) { - $provide.value('version', 'TEST_VER'); - })); - - - it('should replace VERSION', inject(function(interpolateFilter) { - expect(interpolateFilter('before %VERSION% after')).toEqual('before TEST_VER after'); - })); - }); -}); diff --git a/test/unit/servicesSpec.coffee b/test/unit/servicesSpec.coffee deleted file mode 100644 index 79a9888..0000000 --- a/test/unit/servicesSpec.coffee +++ /dev/null @@ -1,7 +0,0 @@ -# jasmine specs for services go here - -describe 'service', -> - beforeEach module 'myApp.services' - describe 'version', -> - it 'should return current version', inject (version) -> - expect(version).toEqual('0.1')