From 68cbc3e2272278cf1fd957708cce285265c97c49 Mon Sep 17 00:00:00 2001 From: Geekuillaume Date: Wed, 26 Mar 2014 20:28:40 +0100 Subject: [PATCH] Added rngviewer route --- app/index.html | 6 ++++-- app/scripts/app.coffee | 6 +++++- app/scripts/controllers/main.coffee | 2 +- app/scripts/controllers/rngviewer.coffee | 9 +++++++++ app/views/main.html | 2 +- app/views/rngviewer.html | 1 + bower.json | 3 ++- karma.conf.js | 1 + package.json | 7 +++---- test/spec/controllers/main.coffee | 2 +- test/spec/controllers/rngviewer.coffee | 19 +++++++++++++++++++ 11 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 app/scripts/controllers/rngviewer.coffee create mode 100644 app/views/rngviewer.html create mode 100644 test/spec/controllers/rngviewer.coffee diff --git a/app/index.html b/app/index.html index b4be4f0..3e5b187 100644 --- a/app/index.html +++ b/app/index.html @@ -12,14 +12,14 @@ - + - + @@ -48,6 +48,7 @@ + @@ -57,6 +58,7 @@ + diff --git a/app/scripts/app.coffee b/app/scripts/app.coffee index 358fa45..87c2666 100644 --- a/app/scripts/app.coffee +++ b/app/scripts/app.coffee @@ -1,7 +1,8 @@ 'use strict' -angular.module('chickenRandApp', [ +angular.module('webAppApp', [ 'ngCookies', + 'ngResource', 'ngSanitize', 'ngRoute' ]) @@ -10,5 +11,8 @@ angular.module('chickenRandApp', [ .when '/', templateUrl: 'views/main.html' controller: 'MainCtrl' + .when '/rngviewer', + templateUrl: 'views/rngviewer.html' + controller: 'RngviewerCtrl' .otherwise redirectTo: '/' diff --git a/app/scripts/controllers/main.coffee b/app/scripts/controllers/main.coffee index 33014ff..91e912a 100644 --- a/app/scripts/controllers/main.coffee +++ b/app/scripts/controllers/main.coffee @@ -1,6 +1,6 @@ 'use strict' -angular.module('chickenRandApp') +angular.module('webAppApp') .controller 'MainCtrl', ($scope) -> $scope.awesomeThings = [ 'HTML5 Boilerplate' diff --git a/app/scripts/controllers/rngviewer.coffee b/app/scripts/controllers/rngviewer.coffee new file mode 100644 index 0000000..3850082 --- /dev/null +++ b/app/scripts/controllers/rngviewer.coffee @@ -0,0 +1,9 @@ +'use strict' + +angular.module('webAppApp') + .controller 'RngviewerCtrl', ($scope) -> + $scope.awesomeThings = [ + 'HTML5 Boilerplate' + 'AngularJS' + 'Karma' + ] diff --git a/app/views/main.html b/app/views/main.html index 0492d09..a8ae288 100644 --- a/app/views/main.html +++ b/app/views/main.html @@ -4,7 +4,7 @@
  • About
  • Contact
    • -

    ChickenRand

    +

    WebApp

    diff --git a/app/views/rngviewer.html b/app/views/rngviewer.html new file mode 100644 index 0000000..81c1dc7 --- /dev/null +++ b/app/views/rngviewer.html @@ -0,0 +1 @@ +

    This is the rngviewer view.

    diff --git a/bower.json b/bower.json index 559950b..a642728 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,5 @@ { - "name": "chicken-rand", + "name": "web-app", "version": "0.0.0", "dependencies": { "angular": "1.2.6", @@ -7,6 +7,7 @@ "es5-shim": "~2.1.0", "jquery": "~1.10.2", "sass-bootstrap": "~3.0.2", + "angular-resource": "1.2.6", "angular-cookies": "1.2.6", "angular-sanitize": "1.2.6", "angular-route": "1.2.6" diff --git a/karma.conf.js b/karma.conf.js index 78e66f5..655ca1f 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -13,6 +13,7 @@ module.exports = function(config) { files: [ 'app/bower_components/angular/angular.js', 'app/bower_components/angular-mocks/angular-mocks.js', + 'app/bower_components/angular-resource/angular-resource.js', 'app/bower_components/angular-cookies/angular-cookies.js', 'app/bower_components/angular-sanitize/angular-sanitize.js', 'app/bower_components/angular-route/angular-route.js', diff --git a/package.json b/package.json index c49525b..38a7e7b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "chickenrand", + "name": "webapp", "version": "0.0.0", "dependencies": {}, "devDependencies": { @@ -28,10 +28,9 @@ "jshint-stylish": "~0.1.3", "load-grunt-tasks": "~0.2.0", "time-grunt": "~0.2.1", + "karma-ng-html2js-preprocessor": "^0.1.0", "karma-ng-scenario": "^0.1.0", - "grunt-karma": "^0.8.2", - "karma": "^0.12.1", - "karma-ng-html2js-preprocessor": "^0.1.0" + "grunt-karma": "^0.8.2" }, "engines": { "node": ">=0.8.0" diff --git a/test/spec/controllers/main.coffee b/test/spec/controllers/main.coffee index 51a4769..f3feba7 100644 --- a/test/spec/controllers/main.coffee +++ b/test/spec/controllers/main.coffee @@ -3,7 +3,7 @@ describe 'Controller: MainCtrl', () -> # load the controller's module - beforeEach module 'chickenRandApp' + beforeEach module 'webAppApp' MainCtrl = {} scope = {} diff --git a/test/spec/controllers/rngviewer.coffee b/test/spec/controllers/rngviewer.coffee new file mode 100644 index 0000000..835fac2 --- /dev/null +++ b/test/spec/controllers/rngviewer.coffee @@ -0,0 +1,19 @@ +'use strict' + +describe 'Controller: RngviewerCtrl', () -> + + # load the controller's module + beforeEach module 'webAppApp' + + RngviewerCtrl = {} + scope = {} + + # Initialize the controller and a mock scope + beforeEach inject ($controller, $rootScope) -> + scope = $rootScope.$new() + RngviewerCtrl = $controller 'RngviewerCtrl', { + $scope: scope + } + + it 'should attach a list of awesomeThings to the scope', () -> + expect(scope.awesomeThings.length).toBe 3