Skip to content

Commit fab628d

Browse files
extcodeextcode
authored
Merge pull request #257 from extcode/cleanup_ci_pipelines
[TASK] Cleanup GitLab CI and GitHub Actions
2 parents 037baa5 + f0cb810 commit fab628d

File tree

9 files changed

+123
-89
lines changed

9 files changed

+123
-89
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,13 @@ jobs:
8888
run: |-
8989
composer require --no-interaction --prefer-dist --no-progress "typo3/cms-core:${{ matrix.typo3-version }}" "typo3/cms-extbase:${{ matrix.typo3-version }}" "typo3/cms-frontend:${{ matrix.typo3-version }}"
9090
91+
- name: Build codeception tester
92+
run: vendor/bin/codecept build
93+
9194
- name: Code Quality (by PHPStan)
9295
run: vendor/bin/phpstan analyse -c Build/phpstan.neon
9396

94-
tests-acceptance:
97+
test-php:
9598
runs-on: ubuntu-latest
9699
needs:
97100
- coding-guideline
@@ -121,6 +124,17 @@ jobs:
121124
- name: Run Functional Tests PHP8.4
122125
run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-functional
123126

127+
test-acceptance:
128+
runs-on: ubuntu-latest
129+
needs:
130+
- test-php
131+
steps:
132+
- uses: actions/checkout@v3
133+
134+
- uses: cachix/install-nix-action@v17
135+
with:
136+
nix_path: nixpkgs=channel:nixos-unstable
137+
124138
- name: Run Acceptance Tests PHP8.2
125139
run: nix-shell --arg phpVersion \"php82\" --pure --run project-test-acceptance
126140

‎.gitlab-ci.yml‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ cache:
55
- .php_cs.cache
66

77
variables:
8-
COMPOSER_CACHE_DIR: ".composer"
9-
TYPO3_PATH_WEB: "$CI_PROJECT_DIR/.build/public"
10-
MYSQL_DATABASE: "typo3"
11-
MYSQL_ROOT_PASSWORD: "joh316"
12-
typo3DatabaseName: "typo3"
13-
typo3DatabaseHost: "mysql"
14-
typo3DatabaseUsername: "root"
15-
typo3DatabasePassword: "joh316"
8+
TYPO3_VERSION: ^13.4
169

1710
before_script:
1811
- apk add git --update
@@ -69,6 +62,7 @@ phpstan:analyse:
6962
- composer config platform.php 8.2
7063
- composer install --no-progress --no-ansi --no-interaction
7164
script:
65+
- vendor/bin/codecept build
7266
- vendor/bin/phpstan analyse -c Build/phpstan.neon --memory-limit 256M
7367

7468
.test_php: &test_php
@@ -86,26 +80,20 @@ phpstan:analyse:
8680
- vendor/bin/phpunit -c Build/UnitTests.xml
8781
- typo3DatabaseDriver=pdo_sqlite vendor/bin/phpunit -c Build/FunctionalTests.xml
8882

89-
# Build in PHP 8.2 and TYPO3 13.4
90-
test:php82:typo3_13:
83+
test:php82:
9184
<<: *test_php
9285
variables:
9386
CONTAINER_IMAGE: $CI_REGISTRY/containers/phpunit-with-php-8.2:main
94-
TYPO3_VERSION: ^13.4
9587

96-
# Build in PHP 8.3 and TYPO3 13.4
97-
test:php83:typo3_13:
88+
test:php83:
9889
<<: *test_php
9990
variables:
10091
CONTAINER_IMAGE: $CI_REGISTRY/containers/phpunit-with-php-8.3:main
101-
TYPO3_VERSION: ^13.4
10292

103-
# Build in PHP 8.4 and TYPO3 13.4
104-
test:php84:typo3_13:
93+
test:php84:
10594
<<: *test_php
10695
variables:
10796
CONTAINER_IMAGE: $CI_REGISTRY/containers/phpunit-with-php-8.4:main
108-
TYPO3_VERSION: ^13.4
10997

11098
.test_codeception: &test_codeception
11199
stage: test
@@ -131,33 +119,24 @@ test:php84:typo3_13:
131119
expire_in: 1 day
132120
when: always
133121

134-
# Build in PHP 8.2 and TYPO3 13.4
135-
test:codception:php82:typo3_13:
122+
codeception:php82:
136123
<<: *test_codeception
137124
variables:
138125
CONTAINER_IMAGE: $CI_REGISTRY/containers/codeception-with-php-8.2:main
139-
TYPO3_VERSION: ^13.4
140-
GECKODRIVER_VERSION: v0.34.0
141126

142-
# Build in PHP 8.3 and TYPO3 13.4
143-
test:codception:php83:typo3_13:
127+
codeception:php83:
144128
<<: *test_codeception
145129
needs:
146-
- test:codception:php82:typo3_13
130+
- codeception:php82
147131
variables:
148132
CONTAINER_IMAGE: $CI_REGISTRY/containers/codeception-with-php-8.3:main
149-
TYPO3_VERSION: ^13.4
150-
GECKODRIVER_VERSION: v0.34.0
151133

152-
# Build in PHP 8.4 and TYPO3 13.4
153-
test:codception:php84:typo3_13:
134+
codeception:php84:
154135
<<: *test_codeception
155136
needs:
156-
- test:codception:php83:typo3_13
137+
- codeception:php83
157138
variables:
158139
CONTAINER_IMAGE: $CI_REGISTRY/containers/codeception-with-php-8.4:main
159-
TYPO3_VERSION: ^13.4
160-
GECKODRIVER_VERSION: v0.34.0
161140

162141
documentation:
163142
stage: documentation

‎Build/phpstan.neon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ parameters:
77
- ../ext_emconf.php
88
- ../ext_localconf.php
99
excludePaths:
10-
- ../Tests/Acceptance
10+
- ../Tests/Acceptance/Support/_generated

‎Tests/Acceptance/AddConfigurableProductWithStockHandlingToCartCest.php‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ public function testAddDifferentItemsWithinAvailableAmountToCart(Tester $I): voi
3232

3333
$I->see('Item was added to cart.', '#product-6 .form-message .form-success');
3434
$I->dontSeeElement('#product-6 .form-message .form-error');
35-
$I->wait(3);
3635

37-
$I->dontSeeElement('#product-6 .form-message .form-success');
38-
$I->dontSeeElement('#product-6 .form-message .form-error');
36+
$I->waitForElementNotVisible('#product-6 .form-message .form-success');
37+
$I->waitForElementNotVisible('#product-6 .form-message .form-error');
3938

4039
$I->fillField('tx_cart_cart[quantity]', 2);
4140
$I->selectOption('tx_cart_cart[beVariants][1]', 'M - green');
@@ -44,10 +43,9 @@ public function testAddDifferentItemsWithinAvailableAmountToCart(Tester $I): voi
4443

4544
$I->see('2 Items were added to cart.', '#product-6 .form-message .form-success');
4645
$I->dontSeeElement('#product-6 .form-message .form-error');
47-
$I->wait(3);
4846

49-
$I->dontSeeElement('#product-6 .form-message .form-success');
50-
$I->dontSeeElement('#product-6 .form-message .form-error');
47+
$I->waitForElementNotVisible('#product-6 .form-message .form-success');
48+
$I->waitForElementNotVisible('#product-6 .form-message .form-error');
5149

5250
$I->fillField('tx_cart_cart[quantity]', 4);
5351
$I->selectOption('tx_cart_cart[beVariants][1]', 'XL - red');
@@ -56,10 +54,9 @@ public function testAddDifferentItemsWithinAvailableAmountToCart(Tester $I): voi
5654

5755
$I->see('4 Items were added to cart.', '#product-6 .form-message .form-success');
5856
$I->dontSeeElement('#product-6 .form-message .form-error');
59-
$I->wait(3);
6057

61-
$I->dontSeeElement('#product-6 .form-message .form-success');
62-
$I->dontSeeElement('#product-6 .form-message .form-error');
58+
$I->waitForElementNotVisible('#product-6 .form-message .form-success');
59+
$I->waitForElementNotVisible('#product-6 .form-message .form-error');
6360
}
6461

6562
public function testAddMoreItemsThanInStockOfASimpleProductToCart(Tester $I): void
@@ -80,10 +77,8 @@ public function testAddMoreItemsThanInStockOfASimpleProductToCart(Tester $I): vo
8077
$I->dontSeeElement('#product-6 .form-message .form-success');
8178
$I->see('Desired number of this item not available.', '#product-6 .form-message .form-error');
8279

83-
$I->wait(3);
84-
85-
$I->dontSeeElement('#product-6 .form-message .form-success');
86-
$I->dontSeeElement('#product-6 .form-message .form-error');
80+
$I->waitForElementNotVisible('#product-6 .form-message .form-success');
81+
$I->waitForElementNotVisible('#product-6 .form-message .form-error');
8782
}
8883

8984
public function testAddOneAndThanMoreItemsThanInStockOfASimpleProductToCart(Tester $I): void
@@ -103,10 +98,9 @@ public function testAddOneAndThanMoreItemsThanInStockOfASimpleProductToCart(Test
10398

10499
$I->see('Item was added to cart.', '#product-6 .form-message .form-success');
105100
$I->dontSeeElement('#product-6 .form-message .form-error');
106-
$I->wait(3);
107101

108-
$I->dontSeeElement('#product-6 .form-message .form-success');
109-
$I->dontSeeElement('#product-6 .form-message .form-error');
102+
$I->waitForElementNotVisible('#product-6 .form-message .form-success');
103+
$I->waitForElementNotVisible('#product-6 .form-message .form-error');
110104

111105
$I->fillField('tx_cart_cart[quantity]', 5);
112106
$I->selectOption('tx_cart_cart[beVariants][1]', 'XL - red');
@@ -116,9 +110,7 @@ public function testAddOneAndThanMoreItemsThanInStockOfASimpleProductToCart(Test
116110
$I->dontSeeElement('#product-6 .form-message .form-success');
117111
$I->see('Desired number of this item not available.', '#product-6 .form-message .form-error');
118112

119-
$I->wait(3);
120-
121-
$I->dontSeeElement('#product-6 .form-message .form-success');
122-
$I->dontSeeElement('#product-6 .form-message .form-error');
113+
$I->waitForElementNotVisible('#product-6 .form-message .form-success');
114+
$I->waitForElementNotVisible('#product-6 .form-message .form-error');
123115
}
124116
}

‎Tests/Acceptance/AddConfigurableProductWithoutStockHandlingToCartCest.php‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,28 @@ public function testAddDifferentItemsToCart(Tester $I): void
3131

3232
$I->see('Item was added to cart.', '#product-5 .form-message .form-success');
3333
$I->dontSeeElement('#product-5 .form-message .form-error');
34-
$I->wait(3);
3534

36-
$I->dontSeeElement('#product-5 .form-message .form-success');
37-
$I->dontSeeElement('#product-5 .form-message .form-error');
35+
$I->waitForElementNotVisible('#product-5 .form-message .form-success');
36+
$I->waitForElementNotVisible('#product-5 .form-message .form-error');
3837

3938
$I->fillField('tx_cart_cart[quantity]', 2);
4039
$I->selectOption('tx_cart_cart[beVariants][1]', 'green');
4140
$I->click('#product-5.add-to-cart-form input.btn[type="submit"]');
4241

4342
$I->see('2 Items were added to cart.', '#product-5 .form-message .form-success');
4443
$I->dontSeeElement('#product-5 .form-message .form-error');
45-
$I->wait(3);
4644

47-
$I->dontSeeElement('#product-5 .form-message .form-success');
48-
$I->dontSeeElement('#product-5 .form-message .form-error');
45+
$I->waitForElementNotVisible('#product-5 .form-message .form-success');
46+
$I->waitForElementNotVisible('#product-5 .form-message .form-error');
4947

5048
$I->fillField('tx_cart_cart[quantity]', 100);
5149
$I->selectOption('tx_cart_cart[beVariants][1]', 'red');
5250
$I->click('#product-5.add-to-cart-form input.btn[type="submit"]');
5351

5452
$I->see('100 Items were added to cart.', '#product-5 .form-message .form-success');
5553
$I->dontSeeElement('#product-5 .form-message .form-error');
56-
$I->wait(3);
5754

58-
$I->dontSeeElement('#product-5 .form-message .form-success');
59-
$I->dontSeeElement('#product-5 .form-message .form-error');
55+
$I->waitForElementNotVisible('#product-5 .form-message .form-success');
56+
$I->waitForElementNotVisible('#product-5 .form-message .form-error');
6057
}
6158
}

‎Tests/Acceptance/AddSimpleProductWithStockHandlingToCartCest.php‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,18 @@ public function testAddDifferentItemsWithinAvailableAmountToCart(Tester $I): voi
3030

3131
$I->see('Item was added to cart.', '#product-1 .form-message .form-success');
3232
$I->dontSeeElement('#product-1 .form-message .form-error');
33-
$I->wait(3);
3433

35-
$I->dontSeeElement('#product-1 .form-message .form-success');
36-
$I->dontSeeElement('#product-1 .form-message .form-error');
34+
$I->waitForElementNotVisible('#product-1 .form-message .form-success');
35+
$I->waitForElementNotVisible('#product-1 .form-message .form-error');
3736

3837
$I->fillField('tx_cart_cart[quantity]', 2);
3938
$I->click('#product-1.add-to-cart-form input.btn[type="submit"]');
4039

4140
$I->see('2 Items were added to cart.', '#product-1 .form-message .form-success');
4241
$I->dontSeeElement('#product-1 .form-message .form-error');
43-
$I->wait(3);
4442

45-
$I->dontSeeElement('#product-1 .form-message .form-success');
46-
$I->dontSeeElement('#product-1 .form-message .form-error');
43+
$I->waitForElementNotVisible('#product-1 .form-message .form-success');
44+
$I->waitForElementNotVisible('#product-1 .form-message .form-error');
4745
}
4846

4947
public function testAddMoreItemsThanInStockOfASimpleProductToCart(Tester $I): void
@@ -62,10 +60,8 @@ public function testAddMoreItemsThanInStockOfASimpleProductToCart(Tester $I): vo
6260
$I->dontSeeElement('#product-1 .form-message .form-success');
6361
$I->see('Desired number of this item not available.', '#product-1 .form-message .form-error');
6462

65-
$I->wait(3);
66-
67-
$I->dontSeeElement('#product-1 .form-message .form-success');
68-
$I->dontSeeElement('#product-1 .form-message .form-error');
63+
$I->waitForElementNotVisible('#product-1 .form-message .form-success');
64+
$I->waitForElementNotVisible('#product-1 .form-message .form-error');
6965
}
7066

7167
public function testAddOneAndThanMoreItemsThanInStockOfASimpleProductToCart(Tester $I): void
@@ -83,20 +79,17 @@ public function testAddOneAndThanMoreItemsThanInStockOfASimpleProductToCart(Test
8379

8480
$I->see('Item was added to cart.', '#product-1 .form-message .form-success');
8581
$I->dontSeeElement('#product-1 .form-message .form-error');
86-
$I->wait(3);
8782

88-
$I->dontSeeElement('#product-1 .form-message .form-success');
89-
$I->dontSeeElement('#product-1 .form-message .form-error');
83+
$I->waitForElementNotVisible('#product-1 .form-message .form-success');
84+
$I->waitForElementNotVisible('#product-1 .form-message .form-error');
9085

9186
$I->fillField('tx_cart_cart[quantity]', 10);
9287
$I->click('#product-1.add-to-cart-form input.btn[type="submit"]');
9388

9489
$I->dontSeeElement('#product-1 .form-message .form-success');
9590
$I->see('Desired number of this item not available.', '#product-1 .form-message .form-error');
9691

97-
$I->wait(3);
98-
99-
$I->dontSeeElement('#product-1 .form-message .form-success');
100-
$I->dontSeeElement('#product-1 .form-message .form-error');
92+
$I->waitForElementNotVisible('#product-1 .form-message .form-success');
93+
$I->waitForElementNotVisible('#product-1 .form-message .form-error');
10194
}
10295
}

‎Tests/Acceptance/AddSimpleProductWithoutStockHandlingToCartCest.php‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,26 @@ public function testAddDifferentItemsToCart(Tester $I): void
3030

3131
$I->see('Item was added to cart.', '#product-2 .form-message .form-success');
3232
$I->dontSeeElement('#product-2 .form-message .form-error');
33-
$I->wait(3);
3433

35-
$I->dontSeeElement('#product-2 .form-message .form-success');
36-
$I->dontSeeElement('#product-2 .form-message .form-error');
34+
$I->waitForElementNotVisible('#product-2 .form-message .form-success');
35+
$I->waitForElementNotVisible('#product-2 .form-message .form-error');
3736

3837
$I->fillField('tx_cart_cart[quantity]', 2);
3938
$I->click('#product-2.add-to-cart-form input.btn[type="submit"]');
4039

4140
$I->see('2 Items were added to cart.', '#product-2 .form-message .form-success');
4241
$I->dontSeeElement('#product-2 .form-message .form-error');
43-
$I->wait(3);
4442

45-
$I->dontSeeElement('#product-2 .form-message .form-success');
46-
$I->dontSeeElement('#product-2 .form-message .form-error');
43+
$I->waitForElementNotVisible('#product-2 .form-message .form-success');
44+
$I->waitForElementNotVisible('#product-2 .form-message .form-error');
4745

4846
$I->fillField('tx_cart_cart[quantity]', 100);
4947
$I->click('#product-2.add-to-cart-form input.btn[type="submit"]');
5048

5149
$I->see('100 Items were added to cart.', '#product-2 .form-message .form-success');
5250
$I->dontSeeElement('#product-2 .form-message .form-error');
53-
$I->wait(3);
5451

55-
$I->dontSeeElement('#product-2 .form-message .form-success');
56-
$I->dontSeeElement('#product-2 .form-message .form-error');
52+
$I->waitForElementNotVisible('#product-2 .form-message .form-success');
53+
$I->waitForElementNotVisible('#product-2 .form-message .form-error');
5754
}
5855
}

‎Tests/Fixtures/cart_products_test/Configuration/TypoScript/setup.typoscript‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
page = PAGE
2-
page.10 < styles.content.get
2+
page.10 < styles.content.get
3+
4+
plugin.tx_cartproducts {
5+
view.partialRootPaths.1 = EXT:cart_products_test/Resources/Private/Partials/
6+
}

0 commit comments

Comments
 (0)