diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 560676f..612452a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,6 +55,7 @@ jobs: bash dev/testv2/tools/scripts/run-unit.sh env: VERSION: ${{ matrix.magento-versions }} + NPM_TOKEN: ${{ secrets.NPM_DEPLOYER_TOKEN }} e2e-tests: runs-on: github-actions-runner-emarsys permissions: @@ -103,3 +104,4 @@ jobs: bash dev/testv2/tools/scripts/run-e2e.sh env: VERSION: ${{ matrix.magento-versions }} + NPM_TOKEN: ${{ secrets.NPM_DEPLOYER_TOKEN }} diff --git a/dev/Magento/composer.json b/dev/Magento/composer.json index 3d394ed..737c6ce 100644 --- a/dev/Magento/composer.json +++ b/dev/Magento/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "magento/product-community-edition": "2.2.3", + "magento/product-community-edition": "2.2.10", "composer/composer": "@alpha" }, "require-dev": { @@ -69,4 +69,4 @@ "extra": { "magento-force": "override" } -} \ No newline at end of file +} diff --git a/dev/composer.json b/dev/composer.json index 66c4f98..8c574d6 100644 --- a/dev/composer.json +++ b/dev/composer.json @@ -5,7 +5,7 @@ "version": "2.2.3", "license": ["OSL-3.0", "AFL-3.0"], "require": { - "magento/product-community-edition": "2.2.3", + "magento/product-community-edition": "2.2.10", "composer/composer": "@alpha", "emartech/emarsys-magento2-extension": "dev-master@dev" }, diff --git a/dev/test/package.json b/dev/test/package.json index 1ae22e0..da3a506 100644 --- a/dev/test/package.json +++ b/dev/test/package.json @@ -24,7 +24,7 @@ "license": "UNLICENSED", "dependencies": { "@emartech/magento2-api": "4.7.0", - "axios": "0.19.0", + "axios": ">=0.28.0", "chai": "4.2.0", "chai-string": "1.5.0", "chai-subset": "1.6.0", @@ -37,9 +37,9 @@ "eslint-plugin-no-only-tests": "2.3.1", "eslint-plugin-security": "1.4.0", "form-data": "2.5.1", - "knex": "0.19.5", + "knex": ">=2.4.0", "mocha": "6.2.0", - "mysql": "2.17.1", + "mysql": ">=2.18.0", "sinon": "7.4.2", "sinon-chai": "3.3.0" } diff --git a/dev/testv2/tools/docker/Dockerfile-mage-node b/dev/testv2/tools/docker/Dockerfile-mage-node index 8c4f551..93dc507 100644 --- a/dev/testv2/tools/docker/Dockerfile-mage-node +++ b/dev/testv2/tools/docker/Dockerfile-mage-node @@ -2,7 +2,7 @@ FROM registry.itg.cloud/itg-commerce/emarsys-magento2-extension-test/cypress:13. ARG NPM_TOKEN ENV NPM_TOKEN=${NPM_TOKEN} -COPY ../../../testv2 /test +COPY testv2 /test WORKDIR /test RUN npm i && \ diff --git a/dev/testv2/tools/docker/docker-compose-test-elastic.yml b/dev/testv2/tools/docker/docker-compose-test-elastic.yml index f57b70a..3bfadee 100644 --- a/dev/testv2/tools/docker/docker-compose-test-elastic.yml +++ b/dev/testv2/tools/docker/docker-compose-test-elastic.yml @@ -41,7 +41,11 @@ services: - 'ES_JAVA_OPTS=-Xms512m -Xmx512m' node: # image: registry.itg.cloud/itg-commerce/emarsys-magento2-extension-test/mage_node:13.6.4 - build: ./Dockerfile-mage-node + build: + context: ../../.. + args: + - NPM_TOKEN=$NPM_TOKEN + dockerfile: testv2/tools/docker/Dockerfile-mage-node container_name: mage_node ipc: host env_file: diff --git a/dev/testv2/tools/docker/docker-compose-test.yml b/dev/testv2/tools/docker/docker-compose-test.yml index 185883c..d896433 100644 --- a/dev/testv2/tools/docker/docker-compose-test.yml +++ b/dev/testv2/tools/docker/docker-compose-test.yml @@ -43,7 +43,11 @@ services: - db node: # image: registry.itg.cloud/itg-commerce/emarsys-magento2-extension-test/mage_node:13.6.4 - build: ./Dockerfile-mage-node + build: + context: ../../.. + args: + - NPM_TOKEN=$NPM_TOKEN + dockerfile: testv2/tools/docker/Dockerfile-mage-node container_name: mage_node ipc: host env_file: