review modifications

HackIllinois · Nov 25, 2016 · 44db93d · 44db93d
1 parent c48b06d
commit 44db93d
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 1,267 deletions.
diff --git a/README.md b/README.md
@@ -132,20 +132,6 @@ npm run prod
 Use `Control-C` to kill the server. Note that `node` must be on your path and that
 the configuration for the target environment must be present in the `config` directory.
 
-
-If you would like to see the available commands, run
-``` shell
-node api.js -h
-```
-
-We currently support
-
-| Argument Parameter | Description |
-| ------------------ | ----------- |
-| -h                 | Show help   |
-| -t                 | Run tests   |
-
-
 ## Documentation
 
 All documentation is available on the [project wiki](https://github.com/HackIllinois/api-2017/wiki).
@@ -162,9 +148,9 @@ the pull-request detailing the issue preventing a merge.
 
 ## Testing
 
-Please set the proper enviornment variables before testing. You can run the tests locally with
+Environment variables should be set in `test.config`. A template is found within the `config` directory.
 
 ``` shell
-node api.js -t
+node run test
 ```
 
diff --git a/api/v1/services/TokenService.js b/api/v1/services/TokenService.js
@@ -54,8 +54,6 @@ module.exports.generateToken = function(user, scope){
 	var tokenVal = utils.crypto.generateResetToken();
 	var userId = user.get('id');
 
-	//Token.where({user_id: userId, type: scope}).fetchAll().then(function(data){console.log(data)});
-
 	return Token
 		.where({user_id: userId, type: scope}).fetchAll()
 		.then(function(tokens) {

diff --git a/test/_end_to_end/auth/admin.js b/test/_end_to_end/auth/admin.js
diff --git a/test/_end_to_end/auth/hacker.js b/test/_end_to_end/auth/hacker.js
diff --git a/test/_end_to_end/auth/index.js b/test/_end_to_end/auth/index.js