Commit Graph

281 Commits

Author SHA1 Message Date
David Jay 0f24ab6b28 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-06 15:56:03 -05:00
Wyatt Johnson 4eb7c72ae2 Merge branch 'master' into email-confirm 2017-01-05 18:45:06 -07:00
Wyatt Johnson be72ebf2a1 Added tests + model implementation. 2017-01-05 17:01:41 -07:00
David Jay 0a064c0e11 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-04 14:33:27 -05:00
Wyatt Johnson 298e1e8d73 Updates to user cli + e2e + tests
- Updates to before + beforeEach for mongooose
- Removed reference to dotenv from cli in e2e, should use
  NODE_ENV=test instead.
- Changed test port from 30?? to 3000 to be consistent with what
  nightwatch was expecting
2017-01-04 10:16:51 -07:00
Wyatt Johnson a7680ae5d9 Initial pass at email confirmation 2017-01-03 17:35:58 -07:00
David Jay b517adab56 Moving commentList to ModerationList 2017-01-03 16:57:53 -05:00
gaba 0fd6f4b44e Working on the tests & sending CSRF 2017-01-03 18:01:21 -03:00
David Jay 5c5a7f5ba5 Switching to central call for mod queue to support current reducer structure. 2017-01-03 15:13:09 -05:00
David Jay dd7bdb8a26 Adding actions for fetching user moderation queue. 2017-01-03 15:05:45 -05:00
David Jay 800382132d Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-03 14:29:05 -05:00
gaba e2a032d4a5 Merge branch 'master' into csrf 2017-01-03 16:25:05 -03:00
gaba 5c6df6d481 Fix tests when flagging because suspect word. 2017-01-03 09:37:02 -03:00
gaba 8e5e75ed6f It works for user signin/signup and posting comments. 2016-12-23 14:57:39 -08:00
gaba ec3e9d1cd4 Merge branch 'master' into csrf 2016-12-22 14:23:01 -08:00
Riley Davis 9d1d109ec0 Merge branch 'master'
Conflicts:
	client/coral-admin/src/reducers/index.js
2016-12-22 12:28:55 -07:00
Riley Davis c6170f558a Merge branch 'master' into add-flag-option 2016-12-22 10:38:34 -07:00
Riley Davis b8b47e9c2c normalize constant names 2016-12-21 16:56:29 -07:00
Wyatt Johnson 6db2361edb Adjusted middleware 2016-12-21 16:19:19 -07:00
Wyatt Johnson 8233937f7a Moved wordlist loading into the middleware 2016-12-21 15:55:40 -07:00
David Jay c867ae8eeb Removing Next and Prev from pager and updating tests. 2016-12-21 12:11:42 -08:00
gaba 29250f2bbc Fixed unpromised rejection in test. 2016-12-20 18:01:28 -08:00
gaba 9c9597ae8c Persist the session in tests through chai agent. 2016-12-20 17:52:55 -08:00
David Jay a490aaeaf0 Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-20 17:02:24 -08:00
Riley Davis 652a41971b Merge branch 'master'
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
2016-12-20 14:51:36 -07:00
gaba 16a4daaeb3 Merge branch 'master' into csrf 2016-12-20 13:46:08 -08:00
gaba e16bc8f7ad Adds agent to persist session in tests. 2016-12-20 12:18:30 -08:00
David Jay a3eb4f5c76 Merge branch 'add-flag-option' of github.com:coralproject/talk into add-flag-option 2016-12-20 11:31:57 -08:00
gaba f49ca9f89a PAss the token around. 2016-12-19 18:11:11 -08:00
David Jay 20505acfbe Updating tests for pending users endpoint. 2016-12-19 20:27:58 -05:00
David Jay be3d506459 Moving action metadata to nested object. 2016-12-19 20:10:42 -05:00
David Jay 4d508f6afa Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-19 13:41:43 -05:00
Belen Curcio 374de3cd27 Replacing export default by module.exports 2016-12-19 14:34:26 -03:00
Riley Davis d65f786dcd Merge branch 'master'
Conflicts:
	routes/api/comments/index.js
2016-12-19 10:28:54 -07:00
Belen Curcio 29ee652ac8 ready to push changes 2016-12-19 13:12:20 -03:00
Belen Curcio 155351a88f Base tests 2016-12-19 12:49:00 -03:00
Belen Curcio ab05403d1c Sign Up test 2016-12-19 12:20:18 -03:00
Belen Curcio 3646b07178 Visitor updated test 2016-12-19 12:03:36 -03:00
Belen Curcio 142d513b6c Permalink tests 2016-12-19 11:50:53 -03:00
Belen Curcio 6d473f780a Permalink tests 2016-12-19 11:23:49 -03:00
Belen Curcio 89709a80c1 Flag Comment 2016-12-19 10:31:51 -03:00
Belen Curcio f493e5413d Passing tests 2016-12-19 09:30:28 -03:00
Belen Curcio 34b56a3044 Visitor tries to flag a comment 2016-12-18 20:21:26 -03:00
Belen Curcio 3f56fcba07 Like tests text check 2016-12-18 20:13:02 -03:00
Belen Curcio e2e278e296 Ádding visitor tests 2016-12-18 19:56:11 -03:00
Belen Curcio 02b8bb61dd Ádding visitor tests 2016-12-18 19:41:16 -03:00
Belen Curcio 9950595245 Commenter likes a comment 2016-12-18 19:34:41 -03:00
Belen Curcio f52a1668b0 Test logouts and approves after commenting 2016-12-18 19:07:31 -03:00
Belen Curcio 0cc0681559 post Comments as a logged in commenter 2016-12-18 13:39:25 -03:00
Belen Curcio fab9f96eb3 Commenter posts a comment 2016-12-18 13:28:45 -03:00