Merge 99b1cd7 into 7c3c15c

plone · Oct 3, 2018 · 5206f9a · 5206f9a
2 parents 7c3c15c + 99b1cd7
commit 5206f9a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -55,12 +55,12 @@ script:
     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" == "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

diff --git a/tests/__init__.robot b/tests/__init__.robot
@@ -46,8 +46,8 @@ Stop Plone Backend
 
 Start Plone React
     Log To Console  Starting Webpack
-    Start Webpack  yarn start:prod
-    ...            check=to be executed: node build/server.js
+    Start Webpack  yarn build && yarn start:prod
+    ...            check=started
 
 Suite Setup
     Run Keyword If   '${API}' == 'Plone'   Start Plone Backend