X Tutup
Skip to content

Commit 5c8da26

Browse files
aaltataaltat
committed
Moved acceptance tests to atest folder
Also made added option to ignore running unit tests.
1 parent 9d0566a commit 5c8da26

File tree

111 files changed

+31
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+31
-30
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.project
22
.pydevproject
33
.idea
4-
test/results
4+
atest/results
55
*.pyc
66
*.orig
77
MANIFEST

‎.travis.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,40 +34,46 @@ matrix:
3434
- SELENIUM=3.9.0
3535
- ROBOTFRAMEWORK=3.0.2
3636
- ROBOT_OPTIONS=--dotted
37+
- INTERPRETER=python3
3738
- python: "pypy3.5"
3839
env:
3940
- BROWSER=chrome
4041
- SELENIUM=3.9.0
4142
- ROBOTFRAMEWORK=3.0.2
4243
- ROBOT_OPTIONS=--dotted
44+
- INTERPRETER=pypy3
4345
- python: "2.7"
4446
env:
4547
- BROWSER=chrome
4648
- SELENIUM=2.53.6
4749
- ROBOTFRAMEWORK=2.9.2
4850
- ROBOT_OPTIONS=--dotted
51+
- INTERPRETER=python2
4952
- python: "2.7"
5053
env:
5154
- BROWSER=chrome
5255
- SELENIUM=3.9.0
5356
- ROBOTFRAMEWORK=2.8.7
5457
- ROBOT_OPTIONS=
58+
- INTERPRETER=python2
5559
- python: "3.3"
5660
env:
5761
- BROWSER=chrome
5862
- SELENIUM=2.53.6
5963
- ROBOTFRAMEWORK=3.0.2
6064
- ROBOT_OPTIONS=--dotted
65+
- INTERPRETER=python3
6166
- python: "3.6"
6267
env:
6368
- BROWSER=firefox
6469
- SELENIUM=3.9.0
6570
- ROBOTFRAMEWORK=3.0.2
6671
- ROBOT_OPTIONS="--exclude Known_Issue_Firefox --dotted"
72+
- INTERPRETER=python3
6773
before_script:
6874
- "export DISPLAY=:99.0"
6975
- "sh -e /etc/init.d/xvfb start"
7076
- pip install selenium==$SELENIUM
7177
- pip install robotframework==$ROBOTFRAMEWORK
7278
script:
73-
- python test/run_tests.py $BROWSER $ROBOT_OPTIONS
79+
- python atest/run.py $BROWSER --interpreter $INTERPRETER $ROBOT_OPTIONS

test/README.rst renamed to atest/README.rst

test/acceptance/__init__.robot renamed to atest/acceptance/__init__.robot

File renamed without changes.

test/acceptance/create_webdriver.robot renamed to atest/acceptance/create_webdriver.robot

File renamed without changes.

test/acceptance/extending.robot renamed to atest/acceptance/extending.robot

File renamed without changes.

test/acceptance/keywords/__init__.robot renamed to atest/acceptance/keywords/__init__.robot

File renamed without changes.

test/acceptance/keywords/alerts.robot renamed to atest/acceptance/keywords/alerts.robot

File renamed without changes.

test/acceptance/keywords/async_javascript.robot renamed to atest/acceptance/keywords/async_javascript.robot

File renamed without changes.

test/acceptance/keywords/checkbox_and_radio_buttons.robot renamed to atest/acceptance/keywords/checkbox_and_radio_buttons.robot

File renamed without changes.

0 commit comments

Comments
 (0)
X Tutup