#4 Update Karma Unit Tests

marcelbirkner · Oct 20, 2014 · 024d17e · 024d17e
1 parent 5abb172
commit 024d17e
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 141 deletions.
diff --git a/client/js/controller/skill_controller.js b/client/js/controller/skill_controller.js
@@ -42,12 +42,7 @@
 
       this.skill = '';
     };
-  });
 
-  angular.module('project-staffing').filter('firstLetterUppercase', function() {
-    return function(input) {
-      return input.charAt(0).toUpperCase() + input.slice(1);
-    };
   });
 
 })();
diff --git a/client/js/filters/filter.js b/client/js/filters/filter.js
@@ -0,0 +1,10 @@
+(function() {
+  'use strict';
+
+  angular.module('project-staffing').filter('firstLetterUppercase', function() {
+    return function(input) {
+      return input.charAt(0).toUpperCase() + input.slice(1);
+    };
+  });
+
+})();
diff --git a/karma.conf.js b/karma.conf.js
@@ -18,7 +18,7 @@ module.exports = function(config) {
       'test/requirejs-main.js',
       {pattern: 'test/*.spec.js', included: false},
       {pattern: 'node_modules/requirejs/require.js', included: false},
-      {pattern: 'static/js/app.js', included: false},
+      {pattern: 'client/js/**/*.js', included: false},
       {pattern: 'static/js/lib/angular-animate.js', included: false},
       {pattern: 'static/js/lib/angular-route.js', included: false},
       {pattern: 'static/js/lib/angular.js', included: false},

diff --git a/static/js/app.js b/static/js/app.js
@@ -10,126 +10,6 @@
 
 })();
 
-(function(){
-  'use strict';
-
-  var app = angular.module('employee-directives', []);
-
-  app.directive('navigation', function(){
-  return {
-    restrict: 'E',
-    templateUrl: 'navigation.html'
-  };
-  });
-  app.directive('employeeTable', function(){
-  return {
-    restrict: 'E',
-    templateUrl: 'employee-table.html'
-  };
-  });
-  app.directive('employeeList', function(){
-  return {
-    restrict: 'E',
-    templateUrl: 'employee-list.html'
-  };
-  });
-  app.directive('employeeForm', function(){
-  return {
-    restrict: 'E',
-    templateUrl: 'employee-form.html'
-  };
-  });
-  app.directive('skillForm', function(){
-  return {
-    restrict: 'E',
-    templateUrl: 'skill-form.html'
-  };
-  });
-  app.directive('projectForm', function(){
-  return {
-    restrict: 'E',
-    templateUrl: 'project-form.html'
-  };
-  });
-  app.directive('homeaddressForm', function(){
-  return {
-    restrict: 'E',
-    templateUrl: 'homeaddress-form.html'
-  };
-  });
-  app.directive('searchaddressForm', function(){
-  return {
-    restrict: 'E',
-    templateUrl: 'searchaddress-form.html'
-  };
-  });
-  app.directive('customerTable', function() {
-  return {
-    restrict : 'E',
-    templateUrl : 'customer-table.html'
-  };
-  });
-  app.directive('searchCustomerAddressForm', function(){
-  return {
-    restrict: 'E',
-    templateUrl: 'searchcustomeraddress-form.html'
-  };
-  });
-})();
-
-(function() {
-  'use strict';
-
-  angular
-  .module('project-staffing')
-  .config(function($routeProvider) {
-    $routeProvider.when('/', {
-      templateUrl: 'views/index.html',
-    })
-    .when('/timeline', {
-      templateUrl: 'views/timeline.html',
-      controller: 'TimelineController',
-      controllerAs: 'timelineCtrl',
-    })
-    .when('/dashboard', {
-      templateUrl: 'views/dashboard.html',
-      controller: 'DashboardController',
-      controllerAs: 'dashboardCtrl',
-    })
-    .when('/list-employees', {
-      templateUrl: 'views/list_employees.html',
-      controller: 'EmployeeController',
-      controllerAs: 'employeeCtrl',
-    })
-    .when('/add-employee', {
-      templateUrl: 'views/add_employee.html',
-      controller: 'EmployeeController',
-      controllerAs: 'employeeCtrl',
-    })
-    .when('/list-customers', {
-      templateUrl: 'views/list_customers.html',
-      controller: 'CustomerController',
-      controllerAs: 'customerCtrl',
-    })
-    .when('/staffing', {
-      templateUrl: 'views/staff_project.html',
-      controller: 'StaffingController',
-      controllerAs: 'staffingCtrl',
-    })
-    .when('/add-customer', {
-      templateUrl: 'views/add_customer.html',
-      controller: 'CustomerController',
-      controllerAs: 'customerCtrl',
-    })
-    .when('/help', {
-      templateUrl: 'views/help.html',
-    })
-    .otherwise({
-      redirectTo: '/',
-    });
-  });
-})();
-
 (function() {
   'use strict';
 
@@ -665,12 +545,7 @@
 
       this.skill = '';
     };
-  });
-
-  angular.module('project-staffing').filter('firstLetterUppercase', function() {
-    return function(input) {
-      return input.charAt(0).toUpperCase() + input.slice(1);
-    };
+
   });
 
 })();
@@ -851,3 +726,134 @@
   });
 
 })();
+
+(function(){
+  'use strict';
+
+  var app = angular.module('employee-directives', []);
+
+  app.directive('navigation', function(){
+  return {
+    restrict: 'E',
+    templateUrl: 'navigation.html'
+  };
+  });
+  app.directive('employeeTable', function(){
+  return {
+    restrict: 'E',
+    templateUrl: 'employee-table.html'
+  };
+  });
+  app.directive('employeeList', function(){
+  return {
+    restrict: 'E',
+    templateUrl: 'employee-list.html'
+  };
+  });
+  app.directive('employeeForm', function(){
+  return {
+    restrict: 'E',
+    templateUrl: 'employee-form.html'
+  };
+  });
+  app.directive('skillForm', function(){
+  return {
+    restrict: 'E',
+    templateUrl: 'skill-form.html'
+  };
+  });
+  app.directive('projectForm', function(){
+  return {
+    restrict: 'E',
+    templateUrl: 'project-form.html'
+  };
+  });
+  app.directive('homeaddressForm', function(){
+  return {
+    restrict: 'E',
+    templateUrl: 'homeaddress-form.html'
+  };
+  });
+  app.directive('searchaddressForm', function(){
+  return {
+    restrict: 'E',
+    templateUrl: 'searchaddress-form.html'
+  };
+  });
+  app.directive('customerTable', function() {
+  return {
+    restrict : 'E',
+    templateUrl : 'customer-table.html'
+  };
+  });
+  app.directive('searchCustomerAddressForm', function(){
+  return {
+    restrict: 'E',
+    templateUrl: 'searchcustomeraddress-form.html'
+  };
+  });
+})();
+
+(function() {
+  'use strict';
+
+  angular.module('project-staffing').filter('firstLetterUppercase', function() {
+    return function(input) {
+      return input.charAt(0).toUpperCase() + input.slice(1);
+    };
+  });
+
+})();
+
+(function() {
+  'use strict';
+
+  angular
+  .module('project-staffing')
+  .config(function($routeProvider) {
+    $routeProvider.when('/', {
+      templateUrl: 'views/index.html',
+    })
+    .when('/timeline', {
+      templateUrl: 'views/timeline.html',
+      controller: 'TimelineController',
+      controllerAs: 'timelineCtrl',
+    })
+    .when('/dashboard', {
+      templateUrl: 'views/dashboard.html',
+      controller: 'DashboardController',
+      controllerAs: 'dashboardCtrl',
+    })
+    .when('/list-employees', {
+      templateUrl: 'views/list_employees.html',
+      controller: 'EmployeeController',
+      controllerAs: 'employeeCtrl',
+    })
+    .when('/add-employee', {
+      templateUrl: 'views/add_employee.html',
+      controller: 'EmployeeController',
+      controllerAs: 'employeeCtrl',
+    })
+    .when('/list-customers', {
+      templateUrl: 'views/list_customers.html',
+      controller: 'CustomerController',
+      controllerAs: 'customerCtrl',
+    })
+    .when('/staffing', {
+      templateUrl: 'views/staff_project.html',
+      controller: 'StaffingController',
+      controllerAs: 'staffingCtrl',
+    })
+    .when('/add-customer', {
+      templateUrl: 'views/add_customer.html',
+      controller: 'CustomerController',
+      controllerAs: 'customerCtrl',
+    })
+    .when('/help', {
+      templateUrl: 'views/help.html',
+    })
+    .otherwise({
+      redirectTo: '/',
+    });
+  });
+})();