Commit Graph

127 Commits

Author SHA1 Message Date
David Jay 3f1f678fb2 Adding comment count test. 2016-11-30 17:49:08 -05:00
David Jay fe4e9c5ea9 All e2e tests passing. 2016-11-30 17:38:23 -05:00
David Jay 7503ba9ab3 Moving settings to mocks. 2016-11-30 16:27:03 -05:00
David Jay 2b0a503c6a Adding mock functions to tests. 2016-11-30 16:18:54 -05:00
David Jay fb977da01d Adding mocks file. 2016-11-29 17:36:17 -05:00
Wyatt Johnson 3c903ddd6d Merge branch 'master' into stream-e2e 2016-11-29 10:41:50 -07:00
Wyatt Johnson fd9636dc9d Merge branch 'master' into asset-settings 2016-11-28 17:16:39 -07:00
Wyatt Johnson 3448752f6f Added asset settings + improved tests for routes 2016-11-28 17:13:11 -07:00
riley 0e3cd001e9 merge master 2016-11-28 16:38:25 -07:00
Riley Davis d5ff0f8f28 keep it DRY. add getInit all over the place. update tests 2016-11-28 16:18:19 -07:00
David Jay 7cf05bbdca Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream 2016-11-28 17:25:07 -05:00
Wyatt Johnson ab46c020d9 Added asset searching 2016-11-28 15:01:13 -07:00
David Jay ca5049feeb Adding settings to stream. 2016-11-28 16:52:00 -05:00
Wyatt Johnson b0f01cf00f Initial commit of asset queuing (#97)
* Initial commit of asset queuing

* Addresssing comments
2016-11-28 13:29:39 -05:00
Wyatt Johnson 9d8968f1ce Corrected action upserting functionality 2016-11-28 10:14:13 -07:00
Wyatt Johnson 325162cb3e Added authorization pieces + test functions 2016-11-22 17:15:14 -07:00
David Jay 9a98ccc846 Commenting out blocked tests and log statements. 2016-11-22 18:48:45 -05:00
David Jay 5ab3fba818 Setting env variables properly in tests. 2016-11-22 18:45:11 -05:00
David Jay 18bfabfd43 Moving configuration setting to shared function 2016-11-22 16:02:57 -05:00
David Jay 2a19399b81 Moving configuration setting to shared function 2016-11-22 16:01:50 -05:00
David Jay e40d5312da Adding premod off reply test. 2016-11-22 15:36:52 -05:00
David Jay 3030bf4f22 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-11-22 15:04:36 -05:00
David Jay 25c40fc212 Applying client.perform consistently. 2016-11-22 14:29:11 -05:00
David Jay 654e3580e7 Adding second test. 2016-11-22 13:49:21 -05:00
David Jay 8507a699e8 Adressing linting errors. 2016-11-21 21:24:34 -05:00
David Jay dd060c5fd1 Signing in via e2e and posting comment. 2016-11-21 21:23:48 -05:00
David Jay 1931c85d67 Merging 2016-11-21 19:23:29 -05:00
David Jay 7aa893ba9e Adding signing flow to tests. 2016-11-21 17:26:04 -05:00
David Jay 357191484d Updating tests. 2016-11-21 17:04:47 -05:00
David Jay 9afc9640ee Merge branch 'user-integration' of https://github.com/coralproject/talk into notification-room 2016-11-21 16:26:22 -05:00
David Jay 769eba4515 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-11-21 15:29:48 -05:00
David Jay 15810e3ece Running comment post test w/ proper settings. 2016-11-21 15:27:31 -05:00
David Jay 29bf5b9990 Adding author info to comments and author name display. 2016-11-18 14:22:21 -05:00
David Jay 7a6dfbcb4a Returning public user info. 2016-11-18 14:13:42 -05:00
David Jay 87e06678dd Clearing db and manipulating settings on nightwatch tests. 2016-11-18 12:56:17 -05:00
Wyatt Johnson 88f963b564 Removed unneeded lines in test 2016-11-18 10:18:44 -07:00
David Jay 95cd83c09e Merge branch 'master' of https://github.com/coralproject/talk into notification-room 2016-11-18 11:55:47 -05:00
David Jay 2e6700e490 Addressing but where flag increases like count. 2016-11-18 11:50:12 -05:00
Belen Curcio f1320c7f04 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-17 10:54:16 -03:00
David Jay a50a32ab66 Adding preconfiguration script. 2016-11-16 18:31:23 -05:00
David Jay d389680224 Utilizing test db for e2e tests. 2016-11-16 17:18:17 -05:00
David Jay 9976464300 Posting comment in e2e test. 2016-11-16 13:44:30 -05:00
David Jay af76e65246 Posting comment in e2e test. 2016-11-16 13:43:36 -05:00
David Erwin e6ff70784d Merge branch 'master' into site-wide-comments 2016-11-16 10:48:28 -05:00
David Erwin b55d3768ff Merge master into site-wide-comments 2016-11-16 10:43:35 -05:00
gaba 4137758bfd Merge branch 'master' into comment-box 2016-11-15 15:21:08 -08:00
gaba 08d672ed46 Changes model and add admin. 2016-11-15 10:11:37 -08:00
David Jay 44292a81ad Moving init and responsehandler to shared functions, updating all routes to return valid JSON. 2016-11-14 17:09:20 -05:00
David Jay 688fbd0bf6 Sending asset_url to backend and retreiving stream with asset. 2016-11-14 16:40:04 -05:00
David Jay 1a7b716820 Updating stream endpoint to expect asset_url and to return asset. 2016-11-14 15:51:17 -05:00