Skip to content

Commit

Permalink
use angular serve for e2e (#3085)
Browse files Browse the repository at this point in the history
* use angular serve for e2e

* generate default .env file

* try to wait for base url

* Revert "try to wait for base url"

This reverts commit 48f55c6.

* try to sleep a bit

* try waiting for url

* bump timeout

* try different approach

* different timeout attempt

* restore sleep

* do not install global libs on ci
  • Loading branch information
DenysVuika authored Mar 23, 2023
1 parent 918176a commit 73a4c95
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 4 deletions.
4 changes: 1 addition & 3 deletions .github/actions/before-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,8 @@ runs:
- name: Replace variables in app.config.json
shell: bash
run: |
npm install -g envsub
APP_CONFIG_FILE_PATH="${{ inputs.to }}/app.config.json"
EXTRA_ENV_SETTINGS=""
envsub $EXTRA_ENV_SETTINGS --all $APP_CONFIG_FILE_PATH $APP_CONFIG_FILE_PATH || exit 1
npx envsub --all $APP_CONFIG_FILE_PATH $APP_CONFIG_FILE_PATH || exit 1
echo -n " \_ Validating replaced config file ... ";
$(npm bin)/ajv validate -s ./node_modules/@alfresco/adf-core/app.config.schema.json -d $APP_CONFIG_FILE_PATH --errors=text --verbose || exit 4
if grep -E -q '\$\{[A-Z0-9_]*\}' $APP_CONFIG_FILE_PATH; then
Expand Down
23 changes: 22 additions & 1 deletion .github/actions/run-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,31 @@ runs:
shell: bash
run: |
./node_modules/.bin/tsc -p "./e2e/$E2E_TSCONFIG" || exit 1;
npx http-server -c-1 $CONTENT_CE_DIST_PATH -p 4200 > /dev/null &\
# npx http-server -c-1 $CONTENT_CE_DIST_PATH -p 4200 > /dev/null &\
{
echo "APP_CONFIG_ECM_HOST={protocol}//{hostname}{:port}"
echo "APP_CONFIG_PLUGIN_FOLDER_RULES=true"
echo "APP_CONFIG_PLUGIN_AOS=true"
echo "APP_CONFIG_PLUGIN_CONTENT_SERVICE=true"
echo "APP_CONFIG_ENABLE_MOBILE_APP_SWITCH=false"
echo "APP_CONFIG_PROVIDER=ECM"
echo "APP_CONFIG_AUTH_TYPE=BASIC"
echo "APP_CONFIG_OAUTH2_HOST=http://localhost:4200/auth/realms/alfresco"
echo "APP_CONFIG_OAUTH2_CLIENTID=alfresco"
echo "APP_CONFIG_SESSION_TIME_FOR_OPEN_APP_DIALOG_DISPLAY_IN_HOURS=12"
echo "APP_CONFIG_OAUTH2_IMPLICIT_FLOW=true"
echo "APP_CONFIG_OAUTH2_SILENT_LOGIN=true"
echo "APP_CONFIG_OAUTH2_REDIRECT_LOGOUT=/"
echo "APP_CONFIG_OAUTH2_REDIRECT_LOGIN=/"
echo "APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI={protocol}//{hostname}{:port}/assets/silent-refresh.html"
} >> .env
npm start > /dev/null &\
if [ ${{ inputs.test-runner }} == "playwright" ]; then
echo "Running playwright tests with options ${{ inputs.options }}"
sleep 60
npx playwright test --config ${{ inputs.options }}
else
echo "Running protractor tests with options ${{ inputs.options }}"
Expand Down
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,21 @@ APP_CONFIG_ECM_HOST="<URL>"
APP_CONFIG_PLUGIN_AOS=false
APP_CONFIG_PLUGIN_CONTENT_SERVICE=true
APP_CONFIG_PLUGIN_FOLDER_RULES=true
APP_CONFIG_ENABLE_MOBILE_APP_SWITCH=false
APP_CONFIG_PROVIDER=ECM
APP_CONFIG_AUTH_TYPE=BASIC
APP_CONFIG_OAUTH2_HOST=http://localhost:4200/auth/realms/alfresco
APP_CONFIG_OAUTH2_CLIENTID=alfresco
APP_CONFIG_PLUGIN_AOS=true
APP_CONFIG_PLUGIN_CONTENT_SERVICE=true
APP_CONFIG_PLUGIN_FOLDER_RULES=true
APP_CONFIG_ENABLE_MOBILE_APP_SWITCH=true
APP_CONFIG_SESSION_TIME_FOR_OPEN_APP_DIALOG_DISPLAY_IN_HOURS="12"
APP_CONFIG_OAUTH2_IMPLICIT_FLOW=true
APP_CONFIG_OAUTH2_SILENT_LOGIN=true
APP_CONFIG_OAUTH2_REDIRECT_LOGOUT=/
APP_CONFIG_OAUTH2_REDIRECT_LOGIN=/
APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI="{protocol}//{hostname}{:port}/assets/silent-refresh.html"
```

Where `<URL>` is the address of the ACS.
Expand Down

0 comments on commit 73a4c95

Please sign in to comment.