Fix tests

Author: Nick Litwin

.eslintignore

@@ -0,0 +1,3 @@
+node_modules/*
+assets/*
+report/*

.eslintrc.json

@@ -9,7 +9,9 @@
   "env": {
     "es6": true,
     "browser": true,
-    "node": true
+    "node": true,
+    "mocha": true,
+    "jquery": true
   },
   "extends": "eslint:recommended",
   "ecmaFeatures": {

.travis.yml

@@ -1,46 +1,42 @@
 language: node_js
 node_js:
-  - 5.5.0
+- 5.5.0
 install:
-  - npm install
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - sleep 3 # give xvfb some time to start
+- npm install
 script:
-  - npm test
-  - webpack --bail --progress --build --tc
+- npm run lint && npm test && npm run build
 sudo: false
 deploy:
-  - provider: s3
-    cache_control: private, no-store, no-cache, must-revalidate, max-age=0
-    detect_encoding: true
-    access_key_id: $AWS_KEY
-    secret_access_key: $AWS_SECRET
-    bucket: app.topcoder-dev.com
-    skip_cleanup: true
-    local_dir: dist
-    on:
-      branch: dev
-  - provider: s3
-    cache_control: private, no-store, no-cache, must-revalidate, max-age=0
-    detect_encoding: true
-    access_key_id: $QA_AWS_KEY
-    secret_access_key: $QA_AWS_SECRET
-    bucket: app.topcoder-qa.com
-    skip_cleanup: true
-    local_dir: dist
-    on:
-      branch: qa-integration
-  - provider: s3
-    cache_control: private, no-store, no-cache, must-revalidate, max-age=0
-    access_key_id: $MASTER_AWS_KEY
-    secret_access_key: $MASTER_AWS_SECRET
-    bucket: app.topcoder.com
-    skip_cleanup: true
-    local_dir: dist
-    on:
-      branch: master
+- provider: s3
+  cache_control: private, no-store, no-cache, must-revalidate, max-age=0
+  detect_encoding: true
+  access_key_id: $AWS_KEY
+  secret_access_key: $AWS_SECRET
+  bucket: app.topcoder-dev.com
+  skip_cleanup: true
+  local_dir: dist
+  on:
+    branch: dev
+- provider: s3
+  cache_control: private, no-store, no-cache, must-revalidate, max-age=0
+  detect_encoding: true
+  access_key_id: $QA_AWS_KEY
+  secret_access_key: $QA_AWS_SECRET
+  bucket: app.topcoder-qa.com
+  skip_cleanup: true
+  local_dir: dist
+  on:
+    branch: qa-integration
+- provider: s3
+  cache_control: private, no-store, no-cache, must-revalidate, max-age=0
+  detect_encoding: true
+  access_key_id: $MASTER_AWS_KEY
+  secret_access_key: $MASTER_AWS_SECRET
+  bucket: app.topcoder.com
+  skip_cleanup: true
+  local_dir: dist
+  on:
+    branch: master
 env:
   matrix:
     - CXX=g++-4.8
@@ -60,6 +56,9 @@ env:
 addons:
   apt:
     sources:
-      - ubuntu-toolchain-r-test
+    - ubuntu-toolchain-r-test
     packages:
-      - g++-4.8
+    - g++-4.8
+notifications:
+  slack:
+    secure: PMGlpdBoRzMlIjCsPWdXJ1wf550b+mpX0x44ggGWNL7ErpNebfyqIbXf4VJXYQDmhVJt31ygDaxTtj8XwZJlbvQjE6WGHU26KvL/efGJJL5EmgFD8LDBFpsbn49PyoZuVOTbSzqP8d8WCCPo4oBvX2r2Q2Ixh/tUx7i4Bcv0XwNpWAR75v1Yq/NftEI48k2GcI3oHqmuEgLHdP93k1rCUM4sBsgkr4PCltZfoE2AWlF6wY59w/oFiKj4FwycY8QjJZa/zbSQq1B/9QD7n4YBY4QjVv3LmjshEiQv1HGo2rNLV+/BB5ZoQ6JEH9h+seduHNTF+mkToKbJ2YjDERLlqLFYWVQKXTqFkSdYuknguJ3uOfXFaGtPDSqTRljE6WW6UDIJi9lDpxFHjH2q848/2O03RKtYeFKJWNbVb7Q2PWTBFxx6OurYra+tbUAorQiYmAQxd0vJY+qzGIDJZIQ8yDE4C10heOhfRyU8wJSKF3xJUKKWVGfBuHivFBZOETFSg0uVBcJnsXRcErvEQz0LuKaZfP81bIokcKUGxum/xyp9mYhYqWDvIj31RUhDMiRxXTPe9PhW0mlOtRG7tm2+8G08exHPSfONSV2IPUtlQt4j2/+I22ncOwtsm6yZzXXbDjoMR2sCHIyJj3lVECOqAnCfNJ6Q0CNJ93LqxKSHdFU=

README.md

@@ -1,4 +1,4 @@
-#### Dev [![Build Status](https://travis-ci.org/appirio-tech/topcoder-app.svg?branch=dev)](https://travis-ci.org/appirio-tech/topcoder-app) Master [![Build Status](https://travis-ci.org/appirio-tech/topcoder-app.svg?branch=master)](https://travis-ci.org/appirio-tech/topcoder-app)
+#### Dev [![Build Status](https://travis-ci.org/appirio-tech/topcoder-app.svg?branch=dev)](https://travis-ci.org/appirio-tech/topcoder-app) QA [![Build Status](https://travis-ci.org/appirio-tech/topcoder-app.svg?branch=qa-integration)](https://travis-ci.org/appirio-tech/topcoder-app) Master [![Build Status](https://travis-ci.org/appirio-tech/topcoder-app.svg?branch=master)](https://travis-ci.org/appirio-tech/topcoder-app)
 # Topcoder-App
 
 This repository houses any new topcoder pages or refactored Angular apps/pages from the tc-site repository.
@@ -13,11 +13,12 @@ Install dependencies by running the following in the root of the project:
  - `npm i`
  - **Note:** You must use npm 3. Type `npm -v` to ensure you have a 3.x version.
 
-In order to test a logged in user, you must make an entry in your `/etc/hosts` file, pointing `local.topcoder-dev.com` to `localhost`. For example, open your `/etc/hosts` file with something like `vim /etc/hosts` and add `127.0.0.1 local.topcoder-dev.com`. After you run `gulp serve`, which launches a new window or tab, change `http://localhost:3000/sample/` to `http://local.topcoder-dev.com:3000/sample/`. You will then be able to login and pick up information from the cookies with `.topcoder-dev.com` as the domain.
+In order to test a logged in user, you must make an entry in your `/etc/hosts` file, pointing `local.topcoder-dev.com` to `localhost`. For example, open your `/etc/hosts` file with something like `vim /etc/hosts` and add `127.0.0.1 local.topcoder-dev.com`. After you run `gulp serve`, which launches a new window or tab, change `http://localhost:3000/login/` to `http://local.topcoder-dev.com:3000/login/`. You will then be able to login and pick up information from the cookies with `.topcoder-dev.com` as the domain.
 
 ## NPM Commands
-- To run locally: `npm run dev` and head to `local.topcoder-dev.com:3000/my-dashboard`
+- To run locally: `npm start` and head to `local.topcoder-dev.com:3000/login`
 - To create the build: `npm run build`
+- To run code linting: `npm run lint`
 - To run the tests: `npm test`
 
 ## Recommended Developer Tools
@@ -47,15 +48,16 @@ JavaScript linting
 - For new projects, you can create a local `.eslintrc.json` file by running `eslint --init`
   - **Note:** If you're using ES6, make sure you add `"modules": true` to `"ecmaFeatures"` and `"node": true` to `"env"` in your `.eslintrc.json` file
   - **Note:** If you are using React, make sure you have `eslint` and `eslint-plugin-react` as `devDependencies` in your `package.json` file
-  - **Optional**: Add `"lint": "eslint ."` to your `package.json` file to run linting at any time via `npm run lint`
 
 Automatic JavaScript linting in Sublime Text
 - Install [SublimeLinter](http://sublimelinter.readthedocs.org/en/latest/installation.html) following the instructions under "Installing via Package Control"
 - Install [SublimeLinter-eslint](https://github.com/roadhump/SublimeLinter-eslint) with the package manager. The package is called `SublimeLinter-contrib-eslint`
 
 ### Testing
 
-To read about the file and folder structure of tests, read [this section](https://github.com/appirio-tech/topcoder-app#tests)
+The tests folder contains mock data (`tests/test-helpers/mock-data.js`). To run tests, use `npm test`.
+
+Spec files live alongside the code they are testing. For example, in peer-review you have `review-status.controller.js` and `review-status.spec.js` in the same review-status folder.
 
 ### Description of Files and Folders
 
@@ -73,11 +75,6 @@ Services live in their own folder. All services are part of the tc.services modu
   - Scripts
     - This folder contains our analytics, e.g. Google, New Relic, etc.
 
-#### tests
-The tests folder contains mock data (`tests/test-helpers/mock-data.js`). To run tests, use `npm test`.
-
-Spec files live alongside the code they are testing. For example, in peer-review you have `review-status.controller.js` and `review-status.spec.js` in the same review-status folder.
-
 ## UI-Router and States
 See any `*.routes.js` file as an example.
 
@@ -87,8 +84,8 @@ See any `*.routes.js` file as an example.
 
 ### Style Guide and Naming Conventions
 
+  - Our travis build runs `npm run lint` and `npm test`, so make sure your code adheres to the code style enforced by our linters
   - Please use ES2015 syntax whenever possible
-  - Do not use semicolons
   - Use the Angular style guide mentioned below
 
 In general, follow this [AngularJS style guide](https://github.com/johnpapa/angular-styleguide), which covers JavaScript code style, JavaScript variable naming, and file naming conventions. One deviation is in the naming of services, where we follow the same pattern as controllers, e.g. UserService, ProfileService.

app/account/login/login.controller.js

@@ -115,14 +115,15 @@ import angular from 'angular'
         return Helpers.redirectPostLogin($stateParams.next)
       })
       .catch(function(resp) {
+        /*eslint no-fallthrough:0*/
         switch (resp.status) {
-          case "ACCOUNT_INACTIVE":
-            window.location.href = "https://www." + CONSTANTS.domain + "/account-inactive/"
-          case "USER_NOT_REGISTERED":
-          default:
-            vm.socialLoginError = 401
-            vm.loginErrors.SOCIAL_LOGIN_ERROR = true
-            break
+        case 'ACCOUNT_INACTIVE':
+          window.location.href = 'https://www.' + CONSTANTS.domain + '/account-inactive/'
+        case 'USER_NOT_REGISTERED':
+        default:
+          vm.socialLoginError = 401
+          vm.loginErrors.SOCIAL_LOGIN_ERROR = true
+          break
         }
       })
     }

app/account/login/login.spec.js

@@ -1,4 +1,4 @@
-/* jshint -W117, -W030 */
+/*eslint no-undef:0*/
 describe('Login Controller', function() {
   var controller
   var scope

app/account/logout/logout.controller.spec.js renamed to app/account/logout/logout.spec.js

@@ -1,6 +1,6 @@
+/*eslint no-undef:0*/
 import angular from 'angular'
 
-/* jshint -W117, -W030 */
 describe('Logout Controller', function() {
   var controller
   var fakeWindow = {

app/account/register/register.spec.js

@@ -1,4 +1,4 @@
-/* jshint -W117, -W030 */
+/*eslint no-undef:0*/
 describe('Register Controller', function() {
   var controller
 
@@ -16,7 +16,7 @@ describe('Register Controller', function() {
   beforeEach(function() {
     var helperService = {
       getCountyObjFromIP: function() {
-        return $q.when({name: "United States", alpha2: "US", alpha3: "USA", code: "840"})
+        return $q.when({name: 'United States', alpha2: 'US', alpha3: 'USA', code: '840'})
       }
     }
 

app/account/reset-password/reset-password.spec.js

@@ -1,7 +1,6 @@
-/* jshint -W117, -W030 */
+/*eslint no-undef:0*/
 describe('Reset Password Controller', function() {
   var controller
-  var apiUrl = 'https://api.topcoder-dev.com/v3'
 
   beforeEach(function() {
     bard.appModule('topcoder')

app/blocks/exception/exception-handler.provider.js

@@ -1,12 +1,14 @@
+import angular from 'angular'
+
 // Include in index.html so that app level exceptions are handled.
 // Exclude from testRunner.html which should run exactly what it wants to run
 (function () {
-  'use strict';
+  'use strict'
 
   angular
     .module('blocks.exception')
     .provider('exceptionHandler', exceptionHandlerProvider)
-    .config(config);
+    .config(config)
 
   /**
    * Must configure the exception handling
@@ -16,18 +18,18 @@
     /* jshint validthis:true */
     this.config = {
       appErrorPrefix: undefined
-    };
+    }
 
     this.configure = function (appErrorPrefix) {
-      this.config.appErrorPrefix = appErrorPrefix;
-    };
+      this.config.appErrorPrefix = appErrorPrefix
+    }
 
     this.$get = function () {
-      return {config: this.config};
-    };
+      return {config: this.config}
+    }
   }
 
-  config.$inject = ['$provide'];
+  config.$inject = ['$provide']
 
   /**
    * Configure by setting an optional string value for appErrorPrefix.
@@ -37,10 +39,10 @@
    * @ngInject
    */
   function config($provide) {
-    $provide.decorator('$exceptionHandler', extendExceptionHandler);
+    $provide.decorator('$exceptionHandler', extendExceptionHandler)
   }
 
-  extendExceptionHandler.$inject = ['$delegate', 'exceptionHandler', 'logger'];
+  extendExceptionHandler.$inject = ['$delegate', 'exceptionHandler', 'logger']
 
   /**
    * Extend the $exceptionHandler service to also display a toast.
@@ -51,20 +53,20 @@
    */
   function extendExceptionHandler($delegate, exceptionHandler, logger) {
     return function (exception, cause) {
-      var appErrorPrefix = exceptionHandler.config.appErrorPrefix || '';
-      var errorData = {exception: exception, cause: cause};
-      exception.message = appErrorPrefix + exception.message;
-      $delegate(exception, cause);
+      var appErrorPrefix = exceptionHandler.config.appErrorPrefix || ''
+      var errorData = {exception: exception, cause: cause}
+      exception.message = appErrorPrefix + exception.message
+      $delegate(exception, cause)
       /**
        * Could add the error to a service's collection,
        * add errors to $rootScope, log errors to remote web server,
        * or log locally. Or throw hard. It is entirely up to you.
-       * throw exception;
+       * throw exception
        *
        * @example
-       *     throw { message: 'error message we added' };
+       *     throw { message: 'error message we added' }
        */
-      logger.error(exception.message, errorData);
-    };
+      logger.error(exception.message, errorData)
+    }
   }
-})();
+})()