Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into autologin-as
- Loading branch information
Showing
209 changed files
with
3,991 additions
and
8,707 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,3 @@ | ||
| { | ||
| "presets": ["flow", "react", "env", "stage-0"], | ||
| "plugins": [ | ||
| "transform-runtime", | ||
| "add-module-exports", | ||
| "transform-decorators-legacy", | ||
| "transform-class-properties", | ||
| "add-react-displayname", | ||
| ["babel-plugin-root-import", { | ||
| "rootPathSuffix": "src" | ||
| }] | ||
| ], | ||
| "env": { | ||
| "development": { | ||
| "plugins": [ | ||
| "typecheck", | ||
| [ | ||
| "react-transform", | ||
| { | ||
| "transforms": [ | ||
| { | ||
| "transform": "react-transform-catch-errors", | ||
| "imports": ["react", "redbox-react"] | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| [ | ||
| "react-intl", | ||
| { | ||
| "messagesDir": "./dist/messages/" | ||
| } | ||
| ] | ||
| ] | ||
| } | ||
| } | ||
| "presets": ["./babel"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,76 @@ | ||
| language: python | ||
| matrix: | ||
| include: | ||
| - name: "Plone Tests" | ||
| python: 2.7.14 | ||
| env: TEST_SUITE=plone | ||
| - name: "Guillotina Tests" | ||
| python: 3.7 | ||
| dist: xenial | ||
| env: TEST_SUITE=guillotina | ||
| - name: "Unit Tests" | ||
| env: TEST_SUITE=unit | ||
| - name: 'Plone Tests' | ||
| python: 2.7.14 | ||
| env: TEST_SUITE=plone | ||
| - name: 'Guillotina Tests' | ||
| python: 3.7 | ||
| dist: xenial | ||
| env: TEST_SUITE=guillotina | ||
| - name: 'Unit Tests' | ||
| env: TEST_SUITE=unit | ||
| cache: | ||
| pip: true | ||
| directories: | ||
| - node_modules | ||
| - node_modules | ||
| sudo: required | ||
| services: | ||
| - docker | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - google-chrome | ||
| - google-chrome | ||
| packages: | ||
| - google-chrome-stable | ||
| - google-chrome-stable | ||
| before_install: | ||
| - nvm install 8.11.3; | ||
| - docker build -t plone/plone-react:testing . | ||
| - if [ "$TEST_SUITE" != "unit" ]; then | ||
| mkdir webdriver; | ||
| wget https://github.com/mozilla/geckodriver/releases/download/v0.20.0/geckodriver-v0.20.0-linux64.tar.gz; | ||
| tar -xzf geckodriver-v0.20.0-linux64.tar.gz -C webdriver; | ||
| wget https://chromedriver.storage.googleapis.com/2.42/chromedriver_linux64.zip; | ||
| unzip chromedriver_linux64.zip -d webdriver; | ||
| export PATH=$PATH:$(pwd)/webdriver; | ||
| npm install -g surge; | ||
| fi | ||
| - nvm install 8.11.3; | ||
| - docker build -t plone/plone-react:testing . | ||
| - if [ "$TEST_SUITE" != "unit" ]; then | ||
| mkdir webdriver; | ||
| wget https://github.com/mozilla/geckodriver/releases/download/v0.20.0/geckodriver-v0.20.0-linux64.tar.gz; | ||
| tar -xzf geckodriver-v0.20.0-linux64.tar.gz -C webdriver; | ||
| wget https://chromedriver.storage.googleapis.com/2.40/chromedriver_linux64.zip; | ||
| unzip chromedriver_linux64.zip -d webdriver; | ||
| export PATH=$PATH:$(pwd)/webdriver; | ||
| npm install -g surge; | ||
| fi | ||
| install: | ||
| - if [ "$TEST_SUITE" == "plone" ]; then | ||
| virtualenv env --python=$(which python) --no-site-packages; | ||
| env/bin/pip install zc.recipe.egg==2.0.4 --no-cache-dir; | ||
| env/bin/pip install -r api/docker/requirements.txt; | ||
| env/bin/pip install -U https://github.com/zopefoundation/z3c.autoinclude/archive/pip.tar.gz#egg=z3c.autoinclude; | ||
| fi | ||
| - pip install -r test-requirements.txt; | ||
| - yarn | ||
| - yarn build | ||
| - if [ "$TEST_SUITE" == "plone" ]; then | ||
| virtualenv env --python=$(which python) --no-site-packages; | ||
| env/bin/pip install zc.recipe.egg==2.0.4 --no-cache-dir; | ||
| env/bin/pip install -r api/docker/requirements.txt; | ||
| env/bin/pip install -U https://github.com/zopefoundation/z3c.autoinclude/archive/pip.tar.gz#egg=z3c.autoinclude; | ||
| fi | ||
| - pip install -r test-requirements.txt; | ||
| - yarn | ||
| - yarn build | ||
| before_script: | ||
| - "export DISPLAY=:99.0" | ||
| - "sh -e /etc/init.d/xvfb start" | ||
| - sleep 3 | ||
| - 'export DISPLAY=:99.0' | ||
| - 'sh -e /etc/init.d/xvfb start' | ||
| - sleep 3 | ||
| script: | ||
| - if [ "$TEST_SUITE" == "unit" ]; then | ||
| docker run --name coverage_front -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e TRAVIS_BRANCH="$TRAVIS_BRANCH" plone/plone-react:testing -- yarn test; | ||
| docker cp coverage_front:/opt/app/coverage/lcov.info .; | ||
| cat lcov.info | ./node_modules/coveralls/bin/coveralls.js; | ||
| fi | ||
| - if [ "$TEST_SUITE" == "guillotina" ]; then | ||
| PYTHONPATH=$(pwd)/tests pybot -v BROWSER:headlesschrome -v API:Guillotina tests; | ||
| fi | ||
| - if [ "$TEST_SUITE" == "plone" ]; then | ||
| PYTHONPATH=$(pwd)/tests env/bin/pybot -v BROWSER:headlesschrome -v API:Plone tests; | ||
| fi | ||
| - if [ "$TEST_SUITE" == "unit" ]; then | ||
| docker run --name coverage_front -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e TRAVIS_BRANCH="$TRAVIS_BRANCH" plone/plone-react:testing -- yarn test --coverage; | ||
| docker cp coverage_front:/opt/app/coverage/lcov.info .; | ||
| cat lcov.info | ./node_modules/coveralls/bin/coveralls.js; | ||
| fi | ||
| # - if [ "$TEST_SUITE" == "guillotina" ]; then | ||
| # PYTHONPATH=$(pwd)/tests pybot -v BROWSER:headlesschrome -v API:Guillotina tests; | ||
| # fi | ||
| # - if [ "$TEST_SUITE" == "plone" ]; then | ||
| # PYTHONPATH=$(pwd)/tests env/bin/pybot -v BROWSER:headlesschrome -v API:Plone tests; | ||
| # fi | ||
| after_script: | ||
| - mkdir robot-results | ||
| - mv log.html output.xml report.html selenium-screenshot-*.png robot-results | ||
| - ls -al robot-results | ||
| - surge robot-results plone-react.surge.sh | ||
| - mkdir robot-results | ||
| - mv log.html output.xml report.html selenium-screenshot-*.png robot-results | ||
| - ls -al robot-results | ||
| - surge robot-results plone-react.surge.sh | ||
| after_success: | ||
| - if [ "$TEST_SUITE" == "guillotina" ]; then | ||
| echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; | ||
| docker tag plone/plone-react:testing plone/plone-react:$TRAVIS_BRANCH.$TRAVIS_COMMIT; | ||
| docker push plone/plone-react:$TRAVIS_BRANCH.$TRAVIS_COMMIT; | ||
| docker tag plone/plone-react:testing plone/plone-react:$TRAVIS_BRANCH.latest; | ||
| docker push plone/plone-react:$TRAVIS_BRANCH.latest; | ||
| fi | ||
| - if [ "$TEST_SUITE" == "guillotina" ]; then | ||
| echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; | ||
| docker tag plone/plone-react:testing plone/plone-react:$TRAVIS_BRANCH.$TRAVIS_COMMIT; | ||
| docker push plone/plone-react:$TRAVIS_BRANCH.$TRAVIS_COMMIT; | ||
| docker tag plone/plone-react:testing plone/plone-react:$TRAVIS_BRANCH.latest; | ||
| docker push plone/plone-react:$TRAVIS_BRANCH.latest; | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| module.exports = { | ||
| presets: ['razzle/babel', 'stage-0'], | ||
| plugins: [ | ||
| 'transform-decorators-legacy', | ||
| [ | ||
| 'babel-plugin-root-import', | ||
| { | ||
| rootPathSuffix: 'src', | ||
| }, | ||
| ], | ||
| [ | ||
| 'react-intl', | ||
| { | ||
| messagesDir: './build/messages/', | ||
| }, | ||
| ], | ||
| ], | ||
| }; |
Oops, something went wrong.