Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EMA-145 - Security findings #62

Merged
merged 8 commits into from
Feb 23, 2024
Merged

EMA-145 - Security findings #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dbf412e
EMA-145 - Security findings
Feb 21, 2024
ad9c468
EMA-145 - Security findings
Feb 21, 2024
58e56ac
EMA-145 - Security findings
Feb 21, 2024
c144e6d
EMA-145 - Security findings
Feb 21, 2024
37e0b80
EMA-145 - Security findings
Feb 21, 2024
226a8d0
EMA-145 - Security findings
Feb 21, 2024
735193c
EMA-145 - Security findings
Feb 21, 2024
7cf7e6e
EMA-145 - Security findings
Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -103,3 +104,4 @@ jobs:
bash dev/testv2/tools/scripts/run-e2e.sh
env:
VERSION: ${{ matrix.magento-versions }}
NPM_TOKEN: ${{ secrets.NPM_DEPLOYER_TOKEN }}
4 changes: 2 additions & 2 deletions dev/Magento/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -69,4 +69,4 @@
"extra": {
"magento-force": "override"
}
}
}
2 changes: 1 addition & 1 deletion dev/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions dev/test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion dev/testv2/tools/docker/Dockerfile-mage-node
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
6 changes: 5 additions & 1 deletion dev/testv2/tools/docker/docker-compose-test-elastic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion dev/testv2/tools/docker/docker-compose-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading