diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index fe8dffc1..e7593c2b 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -13,8 +13,6 @@ default: cache: false formatters: pretty: true - allure: - output_path: '%paths.base%/build/allure' extensions: Behat\MinkExtension: files_path: '%paths.base%/vendor/ibexa/admin-ui/src/lib/Behat/TestFiles/' @@ -65,9 +63,6 @@ default: mode: normal limit: 10 - Allure\Behat\AllureFormatterExtension: - image_attachment_limit: 5 - suites: ~ regression: diff --git a/bin/.travis/rsa_allure b/bin/.travis/rsa_allure deleted file mode 100644 index 310ae0d3..00000000 --- a/bin/.travis/rsa_allure +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn -NhAAAAAwEAAQAAAQEA1dFVPkttApxjrwjNB5rOZTCwPNqG5bHRy127Q/jLkFF+O4u6xUbp -necdGysDON0gQyGkEgdEZ533CrDz9JPBFGjcCnmovX9KybTkc512x8aBGm6u1oJO5tYWTn -SGehvfVzrL/GXgwtDeB9nAr34DDs1jaWJswG1iha/eXsRurJgNljD92xmGwJ6N6vwat43E -I3UV+W7GFqCZ6GxSs3CaI1ks1BMxkUZ3hisBg08j+e0xgJTMtFhF1+L5jUVXulFQyZ7I08 -g7bgl8gUXZEC/swtba8ZQ4L8ojK3KSYsl6fAlbhlR4mlDkanRsS1cnTeAgkTt+Coex8ESn -49QI1bBQYwAAA+C/zVmFv81ZhQAAAAdzc2gtcnNhAAABAQDV0VU+S20CnGOvCM0Hms5lML -A82oblsdHLXbtD+MuQUX47i7rFRumd5x0bKwM43SBDIaQSB0RnnfcKsPP0k8EUaNwKeai9 -f0rJtORznXbHxoEabq7Wgk7m1hZOdIZ6G99XOsv8ZeDC0N4H2cCvfgMOzWNpYmzAbWKFr9 -5exG6smA2WMP3bGYbAno3q/Bq3jcQjdRX5bsYWoJnobFKzcJojWSzUEzGRRneGKwGDTyP5 -7TGAlMy0WEXX4vmNRVe6UVDJnsjTyDtuCXyBRdkQL+zC1trxlDgvyiMrcpJiyXp8CVuGVH -iaUORqdGxLVydN4CCRO34Kh7HwRKfj1AjVsFBjAAAAAwEAAQAAAQEAum24+4XcWGhvahAs -ZLMPvp8DKywGboPqvnzNaOim5QCJJfYhNR0tWKZIdIW+W3hCRwYv/iAj/ox29/Vt4BRsRx -Vetit5ezBfzxtQDZaAGJP1wUw8WYBot1B3RpTHI/TleTMk5L8XiAWBcirknJ8sn11pjltp -Iya8vn+nTc3MCeM5RByAaRtlvGOEkM2R6KI6fScGUZ8B+uXJknH3aguoys3D7DteYbbHzm -cyckKhy33gkPNvxuQaqirBNCueiEfhV+YiwXRo3gI4lLMnIdOeGhA0ZabsAH6AMllxFk+j -Lu3ku34hmyo17jalrrum76XnP3r2L52oLuuytDzaTd7eEQAAAIBYjZA8/1Nuy0y4M24G2z -lS+oyTNhlkj1M6dGlj7wFwCa01lWhknn1hhSLmOth/zvy+S20IjoO6BCAqw759wjasj4dy -gucP9XVLC1UqtwSyVsQlIMNc/gz1l8c6qMPE+Jj5isCE3d0YBqeuixFNlpf2D6zN2E6vnJ -eE071x0grEmwAAAIEA+MGrVr2YaaZmWR3UIIrID1kfOvYELZZ/8skj08uFDVMvCd9Z/j6d -X7Bh3nwzciy30nAyUii3+dKm4IYGwvsrM9O13VlOrHM39VQpYq3YVTUEXzWsWZkuWk8DKM -iiv+s9TcQ3GQyWkFc68ldPubQlqQv03axHJD6RY0ZcQLghq0UAAACBANwLNz2Flgy7s9Mw -MSGd0lpXMNyK6iCIn2/GP5cJGD1MgHtrW9neeCDMhDPkptF77HHODYPzvAfS2sH3rVDyHw -lLSMpT57sbRrJzFQIj0u23ULGYEXkSlnD3oX5D7LbTooZowqo2bhmCf3JQIhqbHQrRq0bx -hYnY//yDYMK8c3OHAAAAJm1hY2llanR5cmFsYUBNYWNpZWpzLU1hY0Jvb2stUHJvLmxvY2 -FsAQIDBA== ------END OPENSSH PRIVATE KEY----- diff --git a/bin/ibexareport b/bin/ibexareport deleted file mode 100755 index bf4d02ec..00000000 --- a/bin/ibexareport +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash -# Examples of use: -# -# Default use in Travis builds: -# bin/ibexareport -# -# Specify non-default SSH key and tested bundle name (required to run script outside Travis runs) -# bin/ibexareport -i=path/to/sshkey -r=BehatBundle -# Reports generated in this way will be hosted on the server in BehatBundle/manual/time_stamp directory - -SSH_KEY_PATH='vendor/ibexa/behat/bin/.travis/rsa_allure' -ALLURE_BUILD_PATH='build/allure/' -HOST_NAME='allure.ez.no' - - # Help command output -usage(){ -echo -e "\ -Usage: -\t ibexareport [OPTIONS...] - -Options: - -\t -i=PATH; path to SSH Key for non-default ssh keys or manual script runs outside Travis machines; -\t -r, --repository=REPOSITORY_NAME; tested repository name - only for manual script runs outside Travis machines; -\t -h; show this help message; -" | column -t -s ";" -} - - # Error message -error(){ - echo "ibexareport: invalid option -- '$1'"; - echo "Try 'ibexareport -h' for more information."; - exit 1; -} - -zip_report_files(){ -cd ${ALLURE_BUILD_PATH} -TIMESTAMP=$(date "+h%H-m%M") -SUFFIX=$(echo $RANDOM) -if [ -z $REPOSITORY_NAME ]; -then - REPORT_NAME="$(echo $GITHUB_REPOSITORY | cut -d'/' -f 2).$GITHUB_RUN_ID.$GITHUB_RUN_NUMBER"; -else - DATESTAMP=$(date "+%Y-%m-%d") - REPORT_NAME="$REPOSITORY_NAME.manual.$DATESTAMP"; -fi -ZIP_FILENAME="$REPORT_NAME-$TIMESTAMP-$SUFFIX" -ZIP_FILENAME_EX="$ZIP_FILENAME.zip" -sudo zip $ZIP_FILENAME_EX * -cd - -} - -send_report_to_server(){ -sftp -o StrictHostKeyChecking=no -q -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -i $SSH_KEY_PATH allure@$HOST_NAME:incoming/ <<< $"put ${ALLURE_BUILD_PATH}${ZIP_FILENAME_EX}" 1> /dev/null - -if [ $? -ne 0 ]; then - exit 1 -fi - -ADDRESS_PATH="$(echo $ZIP_FILENAME | sed 's/\./\//g')" -WEB_ADDRESS="http://$HOST_NAME/$ADDRESS_PATH" -echo "$WEB_ADDRESS" -} - -process_report(){ -zip_report_files 1> /dev/null; -send_report_to_server; -} - - -for i in "$@" -do -case $i in - -i=*) SSH_KEY_PATH="${i#*=}"; shift;; - -r=*|--repository=*) REPOSITORY_NAME="${i#*=}"; shift;; - -h|--help) usage; exit 1;; - *) error $1;; -esac -done - -process_report; diff --git a/composer.json b/composer.json index 752cdffc..a47043df 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,6 @@ "bex/behat-screenshot": "^2.1", "dmore/behat-chrome-extension": "^1.3", "dmore/chrome-mink-driver": "^2.7", - "ezsystems/allure-behat": "^3.3@dev", - "ezsystems/allure-php-api": "^3.3@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", "ibexa/http-cache": "~4.5.0@dev", "ibexa/core": "~4.5.0@dev", @@ -77,7 +75,7 @@ "dev-main": "4.5.x-dev" } }, - "bin": ["bin/ibexabehat", "bin/ibexareport"], + "bin": ["bin/ibexabehat"], "config": { "allow-plugins": { "composer/package-versions-deprecated": true, diff --git a/tests/lib/Core/Behat/ExtendedTableNodeTest.php b/tests/lib/Core/Behat/ExtendedTableNodeTest.php index 2d59634b..325f5c57 100644 --- a/tests/lib/Core/Behat/ExtendedTableNodeTest.php +++ b/tests/lib/Core/Behat/ExtendedTableNodeTest.php @@ -15,7 +15,6 @@ /** * @copyright Copyright (C) eZ Systems AS. All rights reserved. - * * @license For full copyright and license information view LICENSE file distributed with this source code. * * @internal