Skip to content

Commit

Permalink
Remove old Selenium tests
Browse files Browse the repository at this point in the history
  • Loading branch information
PierreRambaud authored and Pierre RAMBAUD committed Sep 18, 2019
1 parent a03b87d commit afbc4dd
Show file tree
Hide file tree
Showing 34 changed files with 703 additions and 4,646 deletions.
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ npm-debug.log.*
/vendor/*
/docs/phpdoc-sf/
/composer.lock
/tests/Selenium/errorShots/
!/tests/Selenium/errorShots/.gitkeep
/tests/Selenium/errorDumps/
!/tests/Selenium/errorDumps/.gitkeep
*.hot-update.js
*.hot-update.json

Expand Down Expand Up @@ -106,7 +102,6 @@ config/settings.old.php
config/xml/*
config/themes/*
!config/xml/themes/default.xml
tests/Selenium/settings.js
themes/*/config/settings_*.json
app/config/parameters.old.yml
app/config/config.php
Expand Down
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
language: php

services:
- mysql

addons:
chrome: stable
apt:
Expand Down Expand Up @@ -34,8 +37,6 @@ matrix:
include:
- php: 7.2
env: EXTRA_DEPS=phpHigh PRESTASHOP_TEST_TYPE=unit
- php: 7.2
env: PRESTASHOP_TEST_TYPE=e2e EXTRA_TESTS=functional
- stage: deploy
php: 7.2
before_install: skip
Expand All @@ -57,13 +58,14 @@ matrix:
on:
all_branches: true
exclude:
- php: 7.2 # Replaced with additional tests
- php: 5.6 # Replaced with additional tests
env: PRESTASHOP_TEST_TYPE=e2e
allow_failures:
- php: 7.2
env: EXTRA_DEPS=phpHigh PRESTASHOP_TEST_TYPE=unit

before_install:
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_10.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :10 -ac -screen 0 1600x1200x16
# Avoid Composer authentication issues
- if [[ "$TRAVIS_REPO_SLUG" = PrestaShop/PrestaShop ]]; then cp travis-scripts/.composer-auth.json ~/.composer/auth.json; fi;
# Apache & php-fpm configuration
Expand Down Expand Up @@ -110,7 +112,6 @@ after_failure:
- sudo cat /var/log/php-fpm.log
- sudo ls -l /var/log/apache2
- sudo cat /var/log/apache2/other_vhosts_access.log
- if [ ! -z "$PRESTASTHOP_SCREENHOST" ]; then bash ./travis-scripts/base64-screenshots; fi # As we cannot upload file, we display the base64 encoded content of the screenshots
- cat $TRAVIS_BUILD_DIR/var/log/dev.log

before_deploy:
Expand Down
54 changes: 0 additions & 54 deletions tests/E2E/.travis.yml

This file was deleted.

Loading

0 comments on commit afbc4dd

Please sign in to comment.