Skip to content

Commit

Permalink
Merge pull request #2 from collective/fix-robot-tests
Browse files Browse the repository at this point in the history
Fixed robot tests.
  • Loading branch information
mauritsvanrees committed Nov 1, 2016
2 parents 64b5be3 + a23024c commit 124c60c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ before_install:
install:
- python bootstrap-buildout.py -c travis.cfg
- bin/buildout -Nc travis.cfg
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- firefox -v
script:
- bin/code-analysis
- bin/test
- bin/test --all
after_success:
- bin/createcoverage
- pip install coverage==3.7 coveralls
Expand Down
12 changes: 5 additions & 7 deletions buildout.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[buildout]
extends = http://dist.plone.org/release/4.3.8/versions.cfg
extends = http://dist.plone.org/release/4.3.11/versions.cfg
extensions = mr.developer
parts =
instance
Expand Down Expand Up @@ -70,9 +70,7 @@ zc.buildout = 2.4.1
zc.recipe.egg = 2.0.2
flake8 = 2.5.4
i18ndude = 3.4.0
robotframework = 3.0
robotframework-ride = 1.5
robotframework-selenium2library = 1.7.4
robotsuite = 1.7.0
selenium = 2.53.1
plone.app.locales = 4.3.9

# Pin flake8-coding to avoid this issue:
# https://github.com/tk0miya/flake8-coding/issues/10
flake8-coding = 1.2.2
2 changes: 1 addition & 1 deletion src/collective/calltoaction/tests/robot/test_overlay.robot
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ I enter valid credentials
Click Button Log in

I wait a short time
Sleep 1.5
Sleep 3

I reload the page
Reload Page
Expand Down
3 changes: 0 additions & 3 deletions travis.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,3 @@ eggs = createcoverage

[versions]
coverage = 3.7
# Pin flake8-coding to avoid this issue:
# https://github.com/tk0miya/flake8-coding/issues/10
flake8-coding = 1.2.2

0 comments on commit 124c60c

Please sign in to comment.