Commit graph

6136 commits

Author SHA1 Message Date
Alasdair Smith
3217a3fbf0 Fix mocha complaining about returning Promise-like object 2018-02-26 15:31:34 +00:00
Alasdair Smith
bd7e4908a2 Force mocha to exit after tests run 2018-02-26 15:30:56 +00:00
Alasdair Smith
46ac74a160 Fix incorrectly scoped variable 2018-02-26 14:26:04 +00:00
Alasdair Smith
2247e4d465 Fix scoping issues where stubs were defined in wrong describe blocks 2018-02-26 14:21:14 +00:00
Alasdair Smith
abf53625fe Fix scope not being applied through callback 2018-02-26 14:02:08 +00:00
Alasdair Smith
136fd84810 Fix module stub in incorrect scope 2018-02-26 13:52:58 +00:00
Alasdair Smith
be6fa346d5 Fix bug where incorrect variable was used 2018-02-26 13:37:17 +00:00
Alasdair Smith
ec7237b7e8 Fix callback stub being defined in wrong scope 2018-02-26 12:33:48 +00:00
Alasdair Smith
2529ed756a Fix callback being defined in wrong describe block 2018-02-26 12:27:54 +00:00
Alasdair Smith
fd8c61985f Fix bug where stubs were attached to undefined variables 2018-02-26 12:19:56 +00:00
Alasdair Smith
5d017beac5 Fix stub incorrectly overriding top level beforeEach 2018-02-26 11:46:06 +00:00
Alasdair Smith
cfc9dbdbb3 Fix bad scoping of user agent 2018-02-26 11:34:08 +00:00
Alasdair Smith
34b53726d4 Fix error not being defined in wrong describe block 2018-02-26 11:19:52 +00:00
Alasdair Smith
192eb8b44f Fix error not being defined in wrong describe block 2018-02-26 11:16:04 +00:00
Alasdair Smith
d79e226a20 Fix callback defined in wrong describe block scope 2018-02-26 10:58:20 +00:00
Alasdair Smith
e6f624c7a0 Make sure mocha exits 2018-02-23 17:16:46 +00:00
Alasdair Smith
22b8c114a2 Upgrade mocha to latest 2018-02-23 17:00:29 +00:00
James Allen
1f62df17c8 Merge pull request #363 from sharelatex/ja-guest-track-changes
Tidy up logic (a bit) around guest track changes
2018-02-23 14:41:12 +00:00
Alasdair Smith
9e14bc4115 Merge pull request #360 from sharelatex/as-karma-webpack
Use karma-webpack for frontend tests
2018-02-23 13:36:49 +00:00
Alasdair Smith
39413f55fe Dummy tests 2018-02-23 11:09:24 +00:00
Alasdair Smith
4e4d9aee89 Configure karma to use webpack for new ES file 2018-02-23 11:09:24 +00:00
Alasdair Smith
6b0b96a357 Install karma-webpack 2018-02-23 11:06:12 +00:00
Alasdair Smith
f4e704573d Merge pull request #353 from sharelatex/as-clean-up-ace-worker
Tear down Ace session when aceEditor is destroyed
2018-02-23 10:14:19 +00:00
Alasdair Smith
85ceab5310 Tear down Ace session when aceEditor is destroyed
This cleans up the Ace worker that parses syntax, preventing a memory leak
2018-02-23 10:13:24 +00:00
Alasdair Smith
5e39e61c9b Merge pull request #348 from sharelatex/as-fix-cm-share
Fix CodeMirror/ShareJS binding when switching docs
2018-02-23 10:12:12 +00:00
Alasdair Smith
92260e7b52 Merge pull request #340 from sharelatex/ja-remove-brand
Remove the public/brand folder
2018-02-23 10:11:47 +00:00
Alasdair Smith
25488456a5 Merge pull request #359 from sharelatex/as-mocha-reporter
Switch to karma-mocha-reporter
2018-02-23 10:11:23 +00:00
James Allen
1d3db923f0 Tidy up logic (a bit) around guest track changes 2018-02-23 09:55:57 +00:00
Paulo Jorge Reis
70da6ad89a Merge pull request #355 from sharelatex/pr-fix-front-chat-widget-config
Update Front chat widget according to latest config changes.
2018-02-22 15:49:32 +00:00
Alasdair Smith
8fa343bc94 Uninstall unused karma-tap-reporter dependency 2018-02-22 14:04:39 +00:00
Alasdair Smith
71e17460b7 Switch to mocha reporter 2018-02-22 14:04:22 +00:00
Alasdair Smith
27bfb1f02d Install karma-mocha-reporter 2018-02-22 14:02:14 +00:00
Alasdair Smith
29410b7aab Fix applyAsync from not evaluating expression in tests
See https://github.com/angular/angular.js/issues/10788#issuecomment-70376834
which explains that applyAsync is scheduled to evaluate in the next tick, but
this is managed by $browser. Therefore we can manually flush the trigger
2018-02-22 13:28:16 +00:00
Alasdair Smith
791c126df6 Fix test to match implementation 2018-02-22 12:09:51 +00:00
Alasdair Smith
2be37795bd TODO for cleaning up sharejs callbacks 2018-02-22 11:44:09 +00:00
Alasdair Smith
598837e17c Use applyAsync to prevent issue when switching docs 2018-02-22 11:44:09 +00:00
Alasdair Smith
c5735a31df Remove unused listener 2018-02-22 11:44:09 +00:00
Alasdair Smith
e1187f3d8a Listen for changes to the CodeMirror Doc, instead of all changes to the editor
This prevents an issue where switching docs (i.e. files) would cause the newly
opened doc from being inserted into the old doc.

This approach is similar to Ace's sessions.
2018-02-22 11:44:09 +00:00
Alasdair Smith
c85e9ba3b1 Instead of setting value of CM, swap Docs
This allows for tracking changes on individual docs (i.e. files), instead of
just changes to the editor. This is similar to how Ace works with sessions
2018-02-22 11:44:09 +00:00
Alasdair Smith
eae8b5a592 Merge pull request #330 from sharelatex/as-karma-tests
Karma tests
2018-02-22 11:06:56 +00:00
Paulo Reis
1b7d3917ed Update Front chat widget according to latest config changes. 2018-02-21 14:58:00 +00:00
James Allen
0371aaaf05 Merge pull request #352 from sharelatex/hof-lock-metrics
Improve lock metrics
2018-02-21 13:52:08 +00:00
James Allen
b2556814fd Merge pull request #350 from sharelatex/pr-front-chat-widget
Front chat widget
2018-02-21 13:52:00 +00:00
Paulo Reis
12233a23c9 Avoid erroring if the front object is undefined. 2018-02-21 13:39:39 +00:00
Paulo Reis
f1a36919f9 Make sure the widget does not overlap the footer. 2018-02-21 13:39:39 +00:00
Paulo Reis
978a8eae59 Move files around. 2018-02-21 13:39:39 +00:00
Paulo Reis
ef119402cf Add Front chat widget. 2018-02-21 13:39:39 +00:00
Hayden Faulds
adc90b68e7 use gauge not inc 2018-02-21 13:25:25 +00:00
Shane Kilkelly
b19f7a6ea3 Re-add template id fields to Project model.
The original pull request (/web-sharelatex-internal/pull/324) had to be reverted
because of a failing test. This just re-adds the fields
2018-02-20 14:19:54 +00:00
Hayden Faulds
584cd71173 fix exceeded lock timeout logging
we were logging this after failing to get the lock, this stops that
2018-02-20 14:03:45 +00:00