Commit graph

34 commits

Author SHA1 Message Date
Jakob Ackermann
535c97e8cf Merge pull request #3774 from overleaf/jpa-meta
[frontend] import meta tag processing from das7pads fork

GitOrigin-RevId: ca74ff9fbbcb51091a626a45468ff3d24d6136ca
2021-03-23 03:05:12 +00:00
Jakob Ackermann
473ff70e99 Merge pull request #3235 from overleaf/jpa-cdn-upload-set-charset
[bin/cdn_upload] set the charset for stylesheets and javascript files

GitOrigin-RevId: f93565ef9475595de64611e04e3f4eca118f5218
2020-09-29 02:05:58 +00:00
Jakob Ackermann
fa594e575b Merge pull request #3113 from overleaf/jpa-translations-mono-repo
[misc] mono repo with translations

GitOrigin-RevId: 1ed86d211f6a2031aafc3e7462687af0e957f9fd
2020-08-19 02:06:08 +00:00
Jakob Ackermann
48b138f227 Merge pull request #2929 from overleaf/jpa-ci-3m30s-with-custom-cloudbuild
[misc] another batch of CI improvements

GitOrigin-RevId: 470fd762ba541d5dce92f0e99830fb2fd8fc4747
2020-07-03 02:04:13 +00:00
Jessica Lawshe
9c9993684c Merge pull request #2911 from overleaf/jel-rename-containers
Update migration script for web container name change

GitOrigin-RevId: e3cefe58f571ab4adf8d7e2b28d19148f394cc83
2020-06-17 02:10:42 +00:00
Jakob Ackermann
2a8e2efe62 Merge pull request #2845 from overleaf/jpa-faster-web-ci
[misc] faster web ci

GitOrigin-RevId: bbd6b12040956f6b397c6ea4d8144e733299400b
2020-05-23 03:18:08 +00:00
Christopher Hoskin
2cb158340d Merge pull request #2450 from overleaf/csh-issue-730-copybara-flag
Make copybara conditional

GitOrigin-RevId: 04ec7af1820b9e594af6a1f845fd09d12ea57d61
2019-12-12 04:15:02 +00:00
Christopher Hoskin
3de7e69a8d Merge pull request #2433 from overleaf/csh-issue-308-copybara-script
Copybara script

GitOrigin-RevId: 6a51a7b4a2205742d45b772cbb8db555240dfa6f
2019-12-04 14:48:44 +00:00
Christopher Hoskin
9b59dcded9 Merge pull request #2420 from overleaf/csh-issue-2504-cdn-upload
Script for CDN upload

GitOrigin-RevId: f90a3b07178d8a231a2a7babac52bed3577065c1
2019-12-02 12:34:01 +00:00
Eric Mc Sween
082f790fb6 Merge pull request #2180 from overleaf/as-clean-up-makefile
Clean up how tests are run in Makefile

GitOrigin-RevId: 9b52ead16392cca09bdf7edc4365f10dc468ccf2
2019-10-23 12:58:39 +00:00
Simon Detheridge
11ce07ec50 Merge pull request #1999 from overleaf/spd-migrations
Add database migrations using 'east'

GitOrigin-RevId: da067292e9db1fad050545858bc7cc39245d3395
2019-10-01 12:09:58 +00:00
Simon Detheridge
6f40fd9b99 Merge pull request #1993 from overleaf/ta-module-test-bootstrap
load tests bootstrap when running module-only unit tests

GitOrigin-RevId: 26abca1b2d4da313a7bf83c8618f9255aaac2ca0
2019-07-22 15:31:36 +00:00
nate stemen
1a3b21b3f1 Merge pull request #1826 from overleaf/ta-fix-bin-scripts
Fix test_unit_app and test_unit_module bin scripts

GitOrigin-RevId: 18e67564fab54cd19310f81422ed1a1560c4cf29
2019-06-03 18:32:01 +00:00
Alasdair Smith
0ca81de78c Merge pull request #1717 from overleaf/as-decaffeinate-backend
Decaffeinate backend

GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
2019-05-29 09:32:21 +00:00
Alasdair Smith
a3bcc71df9 Merge pull request #1807 from overleaf/as-global-sinon-chai
Globally load sinon-chai

GitOrigin-RevId: b0175e021b98d6338171108c6778de80ee58479a
2019-05-28 11:25:26 +00:00
Simon Detheridge
deb9e656a9 Merge pull request #1801 from overleaf/ew-module-unit-test
add ability to unit test a single module

GitOrigin-RevId: 584708066dea3c8d6afa1483953bbae252b48fa7
2019-05-23 13:25:39 +00:00
Simon Detheridge
f5ecc5ad85 Merge pull request #1585 from sharelatex/spd-bin-run
Add bin/run wrapper to web

GitOrigin-RevId: e324256fdca6b334d25385148e7517b4c4c5e702
2019-03-11 11:06:57 +00:00
Hugh O'Brien
72933bdd81 Merge pull request #1546 from sharelatex/sk-add-routes-script
Add a script to print all routes in the project

GitOrigin-RevId: 47e55bb24fb16864296222b7a87b21901c56f084
2019-03-11 11:02:51 +00:00
James Allen
65c1943c63 Merge pull request #1249 from sharelatex/ja-single-process-acceptance-tests-2
Move to running acceptance tests in same process as web server

GitOrigin-RevId: 65757f0b57ac621cafb0066b5c5a7abb30333edd
2018-12-13 09:25:50 +00:00
James Allen
eecbbc045d Merge pull request #1044 from sharelatex/ja-merge-modules
Merge modules into web monorepo

GitOrigin-RevId: 742df73bff72010b01c93e20759a489969b04ed3
2018-10-24 10:29:57 +00:00
Tim Alby
a9f1989eca add test_unit_app task 2018-05-23 15:47:28 +02:00
Alasdair Smith
f11f208772 Revert "Revert "Upgrade to mocha 5.0.1"" 2018-02-27 15:03:21 +00:00
Alasdair Smith
315587605c Revert "Upgrade to mocha 5.0.1" 2018-02-27 12:25:42 +00:00
Alasdair Smith
bd7e4908a2 Force mocha to exit after tests run 2018-02-26 15:30:56 +00:00
Alasdair Smith
e6f624c7a0 Make sure mocha exits 2018-02-23 17:16:46 +00:00
Alasdair Smith
24ec7b77ab Convert frontend test runs to use Docker/karma 2018-02-20 14:01:50 +00:00
Shane Kilkelly
b7226e6985 Add the metrics-web-module 2018-02-01 12:18:54 +00:00
James Allen
662122bb1c CI and local dev environment improvements
The need for this became very noticeable due to the slowness of filesystem access in docker-in-mac, with a full compile taking over a minute for me in docker. Using make to introduce incremental compile makes this near instantaneous outside of docker (if only a few files have changed), and quick enough inside docker.

With incremental compile via make, it compiles quickly enough that re-compiling and restarting the web service automatically when backend files change is quick enough now. This is how the service is run via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, so it shouldn't be necessary to manually restart the container each time a coffee file changes.

At the moment Jenkins pull web modules in via the GitSCM plugin, but I believe this is creating a dependency in Jenkins, where any commits to any of the modules causes all of the web branches to rebuild. By doing it via our own scripts we can hopefully avoid this. It also creates a build process which is reproducible locally.

**Note that at the moment in this PR all modules pull from `ja-dockerize-dev` branches, but these should be merged first, and this PR updated to point to the master branches before merging**. This is necessary for other changes to build process/docker-compose workflow.

As well as a Makefile for web, there is now a `Makefile.module`. This is copied into each module directory by the top-level Makefile, and is written in a way to be flexible and support unit tests, acceptance tests, front-end js for the ide and main, and the modules `app/coffee` directory, while allowing modules to have some of these missing (not all modules have e.g. acceptance tests, or front-end JS). This will allows us to refine the build process in future, without needing to update the Makefile in each module repo separately (I found this to be a painful part of this development).

This makes web compatible with the docker-compose workflow at https://github.com/sharelatex/sharelatex-dev-environment, where each service is running in its own docker container, with networking managed by docker.

Previously the Makefile was set up to run unit tests in docker with `make unit_tests`. This now just runs them natively. In the CI, they are run in docker anyway (all steps in Jenkins are), and locally, they run fine natively with `npm run test:unit`, or can be run in docker via https://github.com/sharelatex/sharelatex-dev-environment with `bin/run web_sl npm run test:unit`.

Previously we did a lot of juggling with only mounting source files (coffee, less, etc) into the docker container for acceptance tests. This was to avoid creating root owned files if the whole directory was mounted. Now instead the whole web directory is mounted read-only, with the compilation step done outside of the container before running the tests.

This allows the host and container to share the `node_modules` folder as well, which avoids needing to `npm install` twice on the CI box, and should speed up the build by a few minutes.

On macOS, this would cause a problem with compiled modules if you tried to use the same `node_modules` to run the app natively. However, if running via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, this is no longer a problem.
2018-01-15 09:36:41 +00:00
James Allen
d7a26e27e5 Run front end tests in CI 2017-12-19 13:58:47 +00:00
James Allen
8ea779af58 Add some front end tests for HistoryManager 2017-12-19 13:58:47 +00:00
Hayden Faulds
78709d819e generate test acceptance files volume for modules 2017-11-30 13:15:23 +00:00
James Allen
5e0fc24c1a Allow modules to specific their own acceptance tests 2017-11-27 17:10:58 +00:00
James Allen
49057a5ab7 Only mount coffee and needed files into Docker so js isn't written back to local system 2017-11-27 17:10:58 +00:00
James Allen
492b37aa6e Add missing bin/ files 2017-11-27 17:10:58 +00:00