From f4aed56a6b4aba33bbb84b9360138783789a6f7a Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 09:54:26 -0800 Subject: [PATCH 001/226] intitial Katalon automated testing commit --- ui-tests/.gitignore | 217 ++++++++ ui-tests/.project | 56 +++ ui-tests/.travis.yml | 474 ++++++++++++++++++ ui-tests/Include/config/log.properties | 6 + ...discussion_status_approved_request.feature | 7 + .../manual_output_checking_component.feature | 19 + .../team_sharing_component.feature | 22 + .../output_checker/adjudicate request.feature | 17 + .../output_checker/claim_request.feature | 14 + .../output_checker/undo_approval.feature | 9 + ...tered_requests_for_output_checkers.feature | 12 + ..._approved_output_files_outside_SRE.feature | 7 + .../requester/canceling_request.feature | 7 + .../requester/create_a_new_request.feature | 39 ++ .../features/requester/draft_requests.feature | 16 + .../edit_previously_submitted_request.feature | 8 + .../features/requester/notifications.feature | 23 + .../requester/request_discussion.feature | 15 + ...edit_project_team_members_requests.feature | 15 + .../requester/see_requests_by_status.feature | 18 + .../requester/view_request_details.feature | 7 + .../groovy/Requester_step_def_kr.groovy | 100 ++++ .../groovy/Requester_step_def_ks.groovy | 107 ++++ .../random_test_request_name.groovy | 33 ++ ui-tests/LICENSE | 201 ++++++++ ui-tests/OCWA.prj | 28 ++ .../input_Password_login.rs | 107 ++++ .../input_Password_password.rs | 107 ++++ .../input_Username or email_userna.rs | 113 +++++ .../a_OCWA Export Tool.rs | 86 ++++ .../a_gfggggg.rs | 91 ++++ .../button_All.rs | 97 ++++ .../div_My RequestsAllDraftQueuedI.rs | 67 +++ .../div_Request Name_Content-ve26f.rs | 66 +++ .../div_You have no requests.rs | 73 +++ .../h1_gfggggg.rs | 72 +++ .../input_Request Name_name.rs | 111 ++++ .../Page_OCWA Development Version/span_All.rs | 72 +++ .../span_Cancel (1).rs | 72 +++ .../span_Cancel.rs | 72 +++ .../span_Draft.rs | 72 +++ .../span_Login (1).rs | 54 ++ .../span_Login.rs | 54 ++ .../span_New Request (1).rs | 79 +++ .../span_New Request.rs | 83 +++ .../span_New Request_1.rs | 70 +++ .../span_Save Close (1).rs | 74 +++ .../span_Save Close.rs | 70 +++ .../table_StatusRequest Identifier.rs | 67 +++ ui-tests/Profiles/default.glbl | 7 + .../Script1544053608217.groovy | 17 + .../Requester/Run cucumber tests.tc | 8 + .../Test Suites/Run OCWA test cases.groovy | 66 +++ ui-tests/Test Suites/Run OCWA test cases.ts | 20 + ui-tests/console.properties | 5 + ui-tests/runTests.sh | 3 + ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 6 + ...com.kms.katalon.execution.webui.properties | 6 + ...s.katalon.integration.analytics.properties | 0 ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 ui-tests/sonar-project.properties | 32 ++ 63 files changed, 3476 insertions(+) create mode 100644 ui-tests/.gitignore create mode 100644 ui-tests/.project create mode 100644 ui-tests/.travis.yml create mode 100644 ui-tests/Include/config/log.properties create mode 100644 ui-tests/Include/features/administator/export_discussion_status_approved_request.feature create mode 100644 ui-tests/Include/features/administator/manual_output_checking_component.feature create mode 100644 ui-tests/Include/features/administator/team_sharing_component.feature create mode 100644 ui-tests/Include/features/output_checker/adjudicate request.feature create mode 100644 ui-tests/Include/features/output_checker/claim_request.feature create mode 100644 ui-tests/Include/features/output_checker/undo_approval.feature create mode 100644 ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature create mode 100644 ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature create mode 100644 ui-tests/Include/features/requester/canceling_request.feature create mode 100644 ui-tests/Include/features/requester/create_a_new_request.feature create mode 100644 ui-tests/Include/features/requester/draft_requests.feature create mode 100644 ui-tests/Include/features/requester/edit_previously_submitted_request.feature create mode 100644 ui-tests/Include/features/requester/notifications.feature create mode 100644 ui-tests/Include/features/requester/request_discussion.feature create mode 100644 ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature create mode 100644 ui-tests/Include/features/requester/see_requests_by_status.feature create mode 100644 ui-tests/Include/features/requester/view_request_details.feature create mode 100644 ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy create mode 100644 ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy create mode 100644 ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy create mode 100644 ui-tests/LICENSE create mode 100644 ui-tests/OCWA.prj create mode 100644 ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs create mode 100644 ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs create mode 100644 ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs create mode 100644 ui-tests/Profiles/default.glbl create mode 100644 ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy create mode 100644 ui-tests/Test Cases/Requester/Run cucumber tests.tc create mode 100644 ui-tests/Test Suites/Run OCWA test cases.groovy create mode 100644 ui-tests/Test Suites/Run OCWA test cases.ts create mode 100644 ui-tests/console.properties create mode 100644 ui-tests/runTests.sh create mode 100644 ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.execution.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.execution.webui.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.jira.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties create mode 100644 ui-tests/sonar-project.properties diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore new file mode 100644 index 000000000..91344686a --- /dev/null +++ b/ui-tests/.gitignore @@ -0,0 +1,217 @@ +# General Ignore +#bin/ +.idea +.DS_Store + +#Helm +helm/ocwa/charts/* +helm/ocwa/config.yaml + +# Golang Ignore + +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + + +# Node Ignore + +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless + + +# Python Ignore + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +/bin/ +/Libs/ +/.settings/ +/.classpath +.svn/ + +# Katalon Studio +Reports/* + diff --git a/ui-tests/.project b/ui-tests/.project new file mode 100644 index 000000000..f129bb1da --- /dev/null +++ b/ui-tests/.project @@ -0,0 +1,56 @@ + + + C%%Users%PaulR%Documents%OCWA%OCWA.prj + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + + + 1544033544591 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1544033544600 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1544122890560 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1544122890586 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + diff --git a/ui-tests/.travis.yml b/ui-tests/.travis.yml new file mode 100644 index 000000000..202efcebf --- /dev/null +++ b/ui-tests/.travis.yml @@ -0,0 +1,474 @@ +dist: trusty +sudo: required +language: python + +services: +- docker + +addons: + sonarcloud: + organization: "ajc_bcgov" + token: + secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= + +matrix: + include: + - name: "Forum Api" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + before_script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + - helm lint helm/forum-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Request Api" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - npm install + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + - helm lint helm/request-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Policy Api" + language: python + python: + - "3.6" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - helm lint helm/policy-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Validation Api" + language: python + python: + - "3.6" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - helm lint helm/validate-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Front End" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Scan - Python" + python: + - "3.6" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1 -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi + + - name: "Scan - NodeJS" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + + - cd /home/travis/build/bcgov/OCWA/frontend + - npm test + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi + + - name: "OCWA Master Helm Chart" + language: node_js + node_js: + - "node" + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa + + - name: "Integration Tests" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + + - cd /home/travis/build/bcgov/OCWA/frontend + - npm test + + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + + #Install Katalon Studios + - cd /home/travis/build/bcgov/OCWA/ui-tests + - chmod ugo+x runTests.sh + - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz + - tar -xvf Katalon_Studio_${KATALON_VERSION}.tar.gz + - ls -liah Katalon_Studio_${KATALON_VERSION}/ + - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} + + #RUN Integration Tests + - ./runTests.sh + +env: + global: + - HELM_URL=https://storage.googleapis.com/kubernetes-helm + - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz + - TARGET_BR=gh-pages + - REPO_DIR=/home/travis/build/kubenow/helm-charts + - GH_URL=https://kubenow.github.io/helm-charts + - YAMLLINT_VERSION=1.8.1 + - CXX=g++-4.8 + - MONGODB=4.1.1 + - KATALON_VERSION=Linux_64-5.8.2 + - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ + - SONAR_APP=sonar-scanner + - SONAR_VERSION=3.2.0.1227-linux + - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= + - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= + #SONAR_TOKEN + - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= + #QUAYIO_USERNAME + - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= + #QUAYIO_PASSWORD + - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= diff --git a/ui-tests/Include/config/log.properties b/ui-tests/Include/config/log.properties new file mode 100644 index 000000000..8142b1dc2 --- /dev/null +++ b/ui-tests/Include/config/log.properties @@ -0,0 +1,6 @@ +# This file is used to configure Katalon Studio execution log levels. + +# When you need to troubleshoot Katalon Studio issue +# logging.level.com.kms=TRACE + +# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature b/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature new file mode 100644 index 000000000..263130bd7 --- /dev/null +++ b/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature @@ -0,0 +1,7 @@ +Feature: export discussion and status log of a request +As an administrator I need the ability to export a discussion / status log to a pdf file upon request approval so that I have a file-based log of the conversation independent of the database + + Scenario: generate an export log of a newly approved request + Given a request has a status of "Review in Progress" + When an output checker approves the request + Then a pdf file should be generates that chronologically lists the discussion about the request as well as status changes \ No newline at end of file diff --git a/ui-tests/Include/features/administator/manual_output_checking_component.feature b/ui-tests/Include/features/administator/manual_output_checking_component.feature new file mode 100644 index 000000000..62c5aa0c6 --- /dev/null +++ b/ui-tests/Include/features/administator/manual_output_checking_component.feature @@ -0,0 +1,19 @@ +Feature: Enable / Disable manual output checker component +As an administrator I need the ability to disable the manual output checker components so that stakeholders that do not have a manual output checking step in their export process can still utilize the application + + Scenario: Manual output checking component turned off and passes all policy tests + Given the manual output checking component has been marked as disabled + And the request passes all policy tests + When a request is submitted + Then the request status should be "Approved" + + Scenario: Manual output checking component turned off and fails a policy test + Given the manual output checking component has been marked as disabled + And the request fails at least one policy test + When a request is submitted + Then the request status should be "Work in progress" + + Scenario: Manual output checking component is turned on + Given the manual output checking component has been marked as enabled + When a request is submitted + Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui-tests/Include/features/administator/team_sharing_component.feature b/ui-tests/Include/features/administator/team_sharing_component.feature new file mode 100644 index 000000000..328d41da8 --- /dev/null +++ b/ui-tests/Include/features/administator/team_sharing_component.feature @@ -0,0 +1,22 @@ +Feature: team sharing of requests +As an administrator I need the ability to enable / disable the ability for requesters to view / edit their team member's request on a per project basis so that multiple types of project sharing models can be accommodated + + Scenario outline: Team sharing enabled + Given team sharing has been marked as enabled + And requester A is logged in + And requester B on the same project exists + And requester B has a request + When requester A views team's requests + Then requester B's request status should be visible + Example: + | status | + | Draft | + | Awaiting review | + | Review in progress | + | Approved | + | Work in progress | + | Archived | + Scenario: Team sharing disabled + Given team sharing has been marked as disabled + When a request is submitted + Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/adjudicate request.feature b/ui-tests/Include/features/output_checker/adjudicate request.feature new file mode 100644 index 000000000..aa0da9e64 --- /dev/null +++ b/ui-tests/Include/features/output_checker/adjudicate request.feature @@ -0,0 +1,17 @@ +Feature: Adjudicate request +As an output checker I need the ability to change the status of a request to "Revisions required" so that I can allow the requester to tweak their request without having deny the request and forcing the requester to create a new request +As an output checker I need the ability to change the status of a request to "Approved" so that I can allow the requester to take their outputs out of the SRE + + Scenario: Request is worthy of approval + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as approved + Then the output checker should see the status of the request updated to "Approved" + And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request + + Scenario: Request is needs revisions + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as needs revisions + Then the output checker should see the status of the request updated to "Work in progress" + And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/claim_request.feature b/ui-tests/Include/features/output_checker/claim_request.feature new file mode 100644 index 000000000..371010dd3 --- /dev/null +++ b/ui-tests/Include/features/output_checker/claim_request.feature @@ -0,0 +1,14 @@ +Feature: Claim a request +As an output checker I need the ability to claim a request so that I can let my fellow output checker know that I'm going to be working on a particular request + +Scenario: Claim an unclaimed request +Given output checker has logged in +When output checker tries to claim an unclaimed request +Then the output checker should be able to see that they're now assigned the request + +Scenario: Claim a request already claimed by another output checker +Given output checker has logged in + And at least on other output checker exists + And the other output checker is assigned to a request +When output checker tries to claim the already assigned request +Then the output checker should be able to see that they're now assigned the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/undo_approval.feature b/ui-tests/Include/features/output_checker/undo_approval.feature new file mode 100644 index 000000000..d82687a8f --- /dev/null +++ b/ui-tests/Include/features/output_checker/undo_approval.feature @@ -0,0 +1,9 @@ +Feature: Undo request approval +As an output checker I need the ability to undo a request approval so that I can appropriately update requests to fix requests that were accidently approved or need to be made unavailable to an requester + +Scenario: Undo an approved request +Given output checker has logged in + And at least one approved request exists +When output checker submits an approved request to undo +Then the output checker should see that the request is now has a status of "Work in progress" +And the status of "Accepted" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature b/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature new file mode 100644 index 000000000..0300a9ed3 --- /dev/null +++ b/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature @@ -0,0 +1,12 @@ +Feature: See a list of all output checking requests +As an output checker I need the ability to see all requests so that I can quickly see what is in the queue + +Scenario Outline: View requests + Given output checker has logged in + When output checker selects a filter + Then the output checker should only see requests of type + Examples: + | filter | filter_condition | + | My requests | requests claimed by the output checker | + | Unassigned | requests not claimed by an output checker | + | All | all requests | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature b/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature new file mode 100644 index 000000000..f4951feff --- /dev/null +++ b/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature @@ -0,0 +1,7 @@ +Feature: Access approved output files outside of the secure environment +As an requester I want to be able to access approved output files outside of the secure environment so that I can share my results with others + Scenario: Access approved request outside of the SRE + Given requester has logged in (outside of SRE) + And requester has an approved request + When requester views their request's approved files + Then requester can copy their approved files to their local computer \ No newline at end of file diff --git a/ui-tests/Include/features/requester/canceling_request.feature b/ui-tests/Include/features/requester/canceling_request.feature new file mode 100644 index 000000000..a54c7dbbb --- /dev/null +++ b/ui-tests/Include/features/requester/canceling_request.feature @@ -0,0 +1,7 @@ +Feature: Canceling a request +As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed + Scenario: Cancel a request + Given requester has logged in + And requester has a request that is "Awaiting review" or "Review in progress" + When the requester cancels the request + Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui-tests/Include/features/requester/create_a_new_request.feature b/ui-tests/Include/features/requester/create_a_new_request.feature new file mode 100644 index 000000000..a44ea1746 --- /dev/null +++ b/ui-tests/Include/features/requester/create_a_new_request.feature @@ -0,0 +1,39 @@ +Feature: create a new request + As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment + Background: + Given requester has logged in + And requester initiates a new request + And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of the authorized user�s knowledge + Scenario: A valid request + Given the export files do not violate any blocking rules + When requester submits their request + Then the requester's request is put in awaiting review + Scenario: A request has no data + Given requester does not provide any data they wish to export + When requester submits their request + Then the requester should not be able to submit the request + + Scenario Outline: A request violates blocking rule + Given a request violates blocking rule: + When requester submits their request + Then requester should not be able to submit the request + And the requester should be informed that has been violated + + Examples: + | blocking_rule | + | A request that has a file that is too big | + | The summation of all export file sizes exceeds the request file size limit | + | An export file has a blocked file extension | + | A request has a file with a StudyID in it | + + Scenario Outline: A request violates warning rule + Given a request violates blocking rule: + When requester submits their request + Then requester should be able to submit the request + And the requester should be informed that has been violated + + Examples: + | warning_rule | + | A request that has a file that exceeds the file size warning threshold | + | The summation of all export file sizes exceeds the request file size warning threshold | + | An export file has a warning file extension | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/draft_requests.feature b/ui-tests/Include/features/requester/draft_requests.feature new file mode 100644 index 000000000..cbe142827 --- /dev/null +++ b/ui-tests/Include/features/requester/draft_requests.feature @@ -0,0 +1,16 @@ +Feature: Draft requests +As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once + Background: + Given requester has logged in + Scenario: Save a draft request (no files) + And requester has started a request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off + + Scenario: Save a draft request (with files) + And requester has started a request + And requester add output files to the request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off \ No newline at end of file diff --git a/ui-tests/Include/features/requester/edit_previously_submitted_request.feature b/ui-tests/Include/features/requester/edit_previously_submitted_request.feature new file mode 100644 index 000000000..05dcde51b --- /dev/null +++ b/ui-tests/Include/features/requester/edit_previously_submitted_request.feature @@ -0,0 +1,8 @@ +Feature: edit a previously submitted request +As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request + Scenario: Edit a request that has been reviewed by an output checker and needs revisions + Given requester has logged in + And requester the request is "Work in Progress" + When the requester views the request + Then the requester should be able to make changes to the request + And re-submit the request \ No newline at end of file diff --git a/ui-tests/Include/features/requester/notifications.feature b/ui-tests/Include/features/requester/notifications.feature new file mode 100644 index 000000000..086673c6a --- /dev/null +++ b/ui-tests/Include/features/requester/notifications.feature @@ -0,0 +1,23 @@ +Feature: Notifications +As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action + + Scenario Outline: requester notifications + Given an requester has created or modified a request + When occurs + Then the requester should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | output checker makes a comment on the request | + | output checker approves the request | + | output checker requests revisions the request | + + Scenario Outline: output checker notifications + Given an output checker has currently claimed a request + When occurs + Then the output checker should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | requester makes a comment on the request | + | requester re-submits a request | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/request_discussion.feature b/ui-tests/Include/features/requester/request_discussion.feature new file mode 100644 index 000000000..f6aff55b7 --- /dev/null +++ b/ui-tests/Include/features/requester/request_discussion.feature @@ -0,0 +1,15 @@ +Feature: Discussion about a request + As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request + As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request + Scenario: requester adds a new comment about request + Given requester has logged in + And requester has a submitted request + And the request has been claimed by an output checker + When requester writes and submits a new comment + Then the requester should see their new comment displayed + And the output checker assigned to the request should be notified of the new comment + Scenario: Output checker adds a new comment about request + Given output checker has logged in + When output checker writes and submits a new comment + Then the output checker should see their new comment displayed + And the requester(s) associated to the request should be notified of the new comment \ No newline at end of file diff --git a/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature b/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature new file mode 100644 index 000000000..7e42638e3 --- /dev/null +++ b/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature @@ -0,0 +1,15 @@ +Feature: seeing / editing project team members requests +As an requester I need the ability to see / edit my team member's requests so that I can more easily collaborate with my fellow team members + Background: + Given requester has logged in + And the requester is a member of a project team + And another project team member has created a request + And the project has team sharing enabled + Scenario: View / edit a team member's request in a project that allows editing of team member's requests + Given the requester's project allows for editing of team member's requests + When the requester views their requests + Then the team member's request should be visible and editable + Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests + Given the requester's project does not allow for editing of team member's requests + When the requester views their requests + Then the team member's request should not be visible or editable \ No newline at end of file diff --git a/ui-tests/Include/features/requester/see_requests_by_status.feature b/ui-tests/Include/features/requester/see_requests_by_status.feature new file mode 100644 index 000000000..14c8c5bc5 --- /dev/null +++ b/ui-tests/Include/features/requester/see_requests_by_status.feature @@ -0,0 +1,18 @@ +Feature: See requester's requests by status +As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review + Scenario Outline: View requests + Given requester has logged in + And the requester has an request + And request was last updated within the last month + When requester views requests + Then requests should be displayed + But requests with updates older than a month should not be displayed + + Examples: + | status | filter | + | Approved | Approved | + | Revisions required | Draft | + | Awaiting review | Submitted | + | Review in progress | Submitted | + | Draft | Draft | + | Work in progress | Draft | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/view_request_details.feature b/ui-tests/Include/features/requester/view_request_details.feature new file mode 100644 index 000000000..d7ad2b06b --- /dev/null +++ b/ui-tests/Include/features/requester/view_request_details.feature @@ -0,0 +1,7 @@ +Feature: View request details +As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions + Scenario: View details of a request + Given requester has logged in + And the requester has submitted a request + When the requester views the request + Then the requester should see the complete record of the request (including export files, supporting files/text, discussion, and status changes) \ No newline at end of file diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy new file mode 100644 index 000000000..88dd0897e --- /dev/null +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy @@ -0,0 +1,100 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as MobileBuiltInKeywords +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WSBuiltInKeywords +import com.kms.katalon.core.webui.driver.DriverFactory as DriverFactory +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +import org.openqa.selenium.firefox.FirefoxDriver +import org.openqa.selenium.WebDriver +import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium + +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When + +import static org.junit.Assert.* +import java.util.regex.Pattern +import static org.apache.commons.lang3.StringUtils.join + + + +public class Requester_step_def_kr { + + WebDriverBackedSelenium selenium + String request_name + + @Given("yrequester has logged in") + def requester_login() { + + WebUI.openBrowser('') + def driver = DriverFactory.getWebDriver() + String baseUrl = "http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/" + selenium = new WebDriverBackedSelenium(driver, baseUrl) + selenium.open("http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/") + selenium.click("id=app-auth-login-button") + selenium.type("id=username", "xxx") + selenium.type("id=password", "xxx") + selenium.click("id=kc-login") + } + + @Given("yrequester has started a request") + def requester_starts_new_request() { + WebUI.waitForPageLoad(0) + selenium.click("id=new-request-button") + + request_name = randomString() + selenium.type("id=name", request_name) + } + + @Given("ythe requester has submitted a request") + def requester_submits_a_request() { + requester_starts_new_request() + //requester saves and add files + //requester adds output files + //requester adds supporting files + //requester add supporting text + //requester submits request for review + } + + @Given("yrequester add output files to the request") + def requester_adds_output_files() { + // selenium.click("id=request-form-save-files-button") + // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") + } + + + @Given("yhas not submitted the request") + def requester_has_not_submitted_new_request() { + } + + @When("ythe requester saves their request") + def requester_saves_new_request() { + selenium.click("id=request-form-save-close-button") + } + + @Then("ythe requester should be able to re-open the request and pick up where they left off") + def confirm_draft_save_was_successful() { + WebUI.waitForPageLoad(0) + WebUI.verifyTextPresent(request_name, false) + } + + def randomString() { + Date today = new Date() + String todaysDate = today.format('MMddyy-hhmm') + String engagementName = 'auto_eng ' + todaysDate + return engagementName + } +} diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy new file mode 100644 index 000000000..00a0c0453 --- /dev/null +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -0,0 +1,107 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.annotation.Keyword +import com.kms.katalon.core.checkpoint.Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.testcase.TestCase +import com.kms.katalon.core.testcase.TestCaseFactory +import com.kms.katalon.core.testdata.TestData +import com.kms.katalon.core.testdata.TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository +import com.kms.katalon.core.testobject.TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords + +import internal.GlobalVariable + +import MobileBuiltInKeywords as Mobile +import WSBuiltInKeywords as WS +import WebUiBuiltInKeywords as WebUI + +import org.openqa.selenium.WebElement +import org.openqa.selenium.WebDriver +import org.openqa.selenium.By + +import com.kms.katalon.core.mobile.keyword.internal.MobileDriverFactory +import com.kms.katalon.core.webui.driver.DriverFactory + +import com.kms.katalon.core.testobject.RequestObject +import com.kms.katalon.core.testobject.ResponseObject +import com.kms.katalon.core.testobject.ConditionType +import com.kms.katalon.core.testobject.TestObjectProperty + +import com.kms.katalon.core.mobile.helper.MobileElementCommonHelper +import com.kms.katalon.core.util.KeywordUtil + +import com.kms.katalon.core.webui.exception.WebElementNotFoundException + +import cucumber.api.java.en.And +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When + + +class Requester_step_def_ks { + String request_name = '' + TestObject newRequestButtonObject = null + TestObject requestFormSaveCloseButtonObject = null + + /** + * The step definitions below match with Katalon sample Gherkin steps + */ + @Given("requester has logged in") + def requester_login() { + WebUI.openBrowser('') + + WebUI.navigateToUrl('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) + + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + + WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + + WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + } + + @Given("requester has started a request") + def requester_starts_new_request() { + + newRequestButtonObject = new TestObject("new-request-button") + newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + + WebUI.waitForPageLoad(0) + + WebUI.waitForElementClickable(newRequestButtonObject, 0) + WebUI.click(newRequestButtonObject) + + request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + } + + @Given("has not submitted the request") + def requester_has_not_submitted_new_request() { + } + + @Given("requester add output files to the request") + def requester_adds_output_files() { + } + + @When("the requester saves their request") + def requester_saves_new_request() { + requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + WebUI.click(requestFormSaveCloseButtonObject) + } + + @Then("the requester should be able to re-open the request and pick up where they left off") + def confirm_draft_save_was_successful() { + WebUI.waitForPageLoad(0) + WebUI.verifyTextPresent(request_name, false) + } +} \ No newline at end of file diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy new file mode 100644 index 000000000..281c294f2 --- /dev/null +++ b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -0,0 +1,33 @@ +package test_OCWA_keywords + +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.annotation.Keyword +import com.kms.katalon.core.checkpoint.Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.testcase.TestCase +import com.kms.katalon.core.testdata.TestData +import com.kms.katalon.core.testobject.TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI + +import internal.GlobalVariable + + +public class random_test_request_name { + @Keyword + def gen_random_test_request_name() { + Date today = new Date() + String todaysDate = today.format('MMddyy-hhmm') + String engagementName = 'auto_eng ' + todaysDate + //return (engagementName) + //WebUI.comment(engagementName) + //return "bananas" + return engagementName + } +} \ No newline at end of file diff --git a/ui-tests/LICENSE b/ui-tests/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/ui-tests/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/ui-tests/OCWA.prj b/ui-tests/OCWA.prj new file mode 100644 index 000000000..b72b1c47e --- /dev/null +++ b/ui-tests/OCWA.prj @@ -0,0 +1,28 @@ + + + + OCWA + + c5e0fe7e-c962-4704-a11f-3f2a0dde36b0 + 5.9.0 + 0 + + + + Include/scripts/groovy + + + + + Include/scripts/groovy + + + Include/features + + + Include/config + + + + GENERIC + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs b/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs new file mode 100644 index 000000000..231e9f891 --- /dev/null +++ b/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs @@ -0,0 +1,107 @@ + + + + input_Password_login + + b03993b5-c5ae-4031-8150-2361e6dc57b7 + + + XPATH + //input[@id='kc-login'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 4 + + + false + equals + class + Main + btn btn-primary btn-lg + + + true + equals + name + Main + login + + + true + equals + id + Main + kc-login + + + true + equals + type + Main + submit + + + false + equals + value + Main + Log in + + + false + equals + xpath + Main + id("kc-login") + + + true + equals + xpath:attributes + //input[@id='kc-login'] + + + false + equals + xpath:idRelative + //div[@id='kc-form-buttons']/div/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'kc-login', '"', ')')])[1]/preceding::input[1] + + + false + equals + xpath:position + //div[3]/div[2]/div/input + + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs b/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs new file mode 100644 index 000000000..9a0da9be0 --- /dev/null +++ b/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs @@ -0,0 +1,107 @@ + + + + input_Password_password + + 0e5ab8cd-490d-4fe5-8476-6643d833291e + + + XPATH + //input[@id='password'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 2 + + + true + equals + id + Main + password + + + false + equals + class + Main + form-control + + + true + equals + name + Main + password + + + true + equals + type + Main + password + + + false + equals + autocomplete + Main + off + + + false + equals + xpath + Main + id("password") + + + true + equals + xpath:attributes + //input[@id='password'] + + + false + equals + xpath:idRelative + //form[@id='kc-form-login']/div[2]/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[2] + + + false + equals + xpath:position + //div[2]/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[2] + + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs b/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs new file mode 100644 index 000000000..e4518409c --- /dev/null +++ b/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs @@ -0,0 +1,113 @@ + + + + input_Username or email_userna + + 1e087123-1a2b-412f-9b3f-f68243f2f4cc + + + XPATH + //input[@id='username'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 1 + + + true + equals + id + Main + username + + + false + equals + class + Main + form-control + + + true + equals + name + Main + username + + + true + equals + type + Main + text + + + false + equals + autocomplete + Main + off + + + false + equals + xpath + Main + id("username") + + + true + equals + xpath:attributes + //input[@id='username'] + + + false + equals + xpath:idRelative + //form[@id='kc-form-login']/div/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='ocwa'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/preceding::input[1] + + + false + equals + xpath:position + //input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[3] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs b/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs new file mode 100644 index 000000000..d8b91480a --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs @@ -0,0 +1,86 @@ + + + + a_OCWA Export Tool + + 25096df1-9278-4593-ba26-96d3644e62fb + + + XPATH + //div[@id='main']/div/div/main/div/a + + + XPATH + false + + true + equals + tag + Main + a + + + false + equals + class + Main + src-components-app-bar-styles_brand--2yq_z3-4 + + + true + equals + href + Main + / + + + true + equals + text + Main + OCWA Export Tool + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-components-app-bar-styles_container--1ufsCzTM"]/a[@class="src-components-app-bar-styles_brand--2yq_z3-4"] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div/a + + + false + equals + xpath:link + //a[contains(text(),'OCWA Export Tool')] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/preceding::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='gfggggg'])[1]/preceding::a[1] + + + false + equals + xpath:href + //a[contains(@href, '/')] + + + false + equals + xpath:position + //a + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs b/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs new file mode 100644 index 000000000..4b8862f1c --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs @@ -0,0 +1,91 @@ + + + + a_gfggggg + + 8030b58a-35da-4934-a959-42f86e9e595f + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table/tbody/tr/td[2]/strong/a + + + XPATH + false + + true + equals + tag + Main + a + + + true + equals + href + Main + /requests/5c08241fe35b430013db0cae + + + true + equals + text + Main + gfggggg + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainerAdvanced__Container-sc-1s2zdt8-0 cFyKDm"]/table[@class="DynamicTable__Table-sc-1naczgt-0 cFUPVR"]/tbody[1]/tr[@class="TableRow__TableBodyRow-sc-1kwbh2h-0 jLQmXi"]/td[@class="TableCell__TableBodyCell-sc-1mgclzx-0 dGStZT"]/strong[1]/a[1] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table/tbody/tr/td[2]/strong/a + + + false + equals + xpath:link + //a[contains(text(),'gfggggg')] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Output Checker'])[1]/following::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Updated On'])[1]/following::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Dec 5th, 2018'])[1]/preceding::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Dec 5th, 2018'])[2]/preceding::a[1] + + + false + equals + xpath:href + //a[contains(@href, '/requests/5c08241fe35b430013db0cae')] + + + false + equals + xpath:position + //strong/a + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs b/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs new file mode 100644 index 000000000..e3e500cf5 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs @@ -0,0 +1,97 @@ + + + + button_All + + 57c6c6d1-9295-45c9-a94f-4e2707f2030b + + + XPATH + (//button[@type='button'])[2] + + + BASIC + //button[@type = 'button' and (text() = 'All' or . = 'All')] + + + BASIC + false + + true + equals + tag + Main + button + + + false + equals + class + Main + sc-ifAKCX eiXwJb + + + false + equals + spacing + Main + default + + + true + equals + type + Main + button + + + true + equals + text + Main + All + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"] + + + true + equals + xpath:attributes + (//button[@type='button'])[2] + + + false + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::button[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::button[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::button[1] + + + false + equals + xpath:position + //nav/div/div/button + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs new file mode 100644 index 000000000..7fdfa747c --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs @@ -0,0 +1,67 @@ + + + + div_My RequestsAllDraftQueuedI + + 0fbd49b5-aff6-4db6-a4fe-1ca40e30216a + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2] + + + XPATH + false + + true + equals + tag + Main + div + + + false + equals + class + Main + sc-jTzLTM gBDbcZ + + + true + equals + text + Main + My RequestsAllDraftQueued/In ReviewFlaggedDeniedCancelledStatusRequest IdentifierSubmitted OnUpdated OnOutput CheckergfgggggDec 5th, 2018Dec 5th, 2018-Actions + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::div[17] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::div[18] + + + false + equals + xpath:position + //div[2]/div/div/div[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs new file mode 100644 index 000000000..ba14bcb03 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs @@ -0,0 +1,66 @@ + + + + div_Request Name_Content-ve26f + + 7c1d1122-bf34-4010-91ca-3e08c1ecd1b7 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::div[3] + + + XPATH + false + + true + equals + tag + Main + div + + + false + equals + class + Main + Content-ve26fj-1 kmGRCO + + + true + equals + xpath + Main + /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-clBsIJ daqMjj"]/div[@class="Form__FormWrapper-sc-11btfyj-0 fTWjSn"]/form[1]/div[@class="Field__FieldWrapper-vqybw1-0 doxtck"]/div[@class="FieldTextStateless__Wrapper-ynbdsh-0 gIJAym"]/div[@class="Content__ContentWrapper-ve26fj-2 feWTNh"]/div[@class="Content__ChildWrapper-ve26fj-0 ilJUcG"]/div[@class="Content-ve26fj-1 kmGRCO"] + + + true + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::div[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::div[5] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='This field is required'])[1]/preceding::div[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::div[2] + + + false + equals + xpath:position + //form/div/div/div/div/div + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs new file mode 100644 index 000000000..66899c38a --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs @@ -0,0 +1,73 @@ + + + + div_You have no requests + + b89ed3fb-0198-49dd-8259-f0813e8d1488 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div[2] + + + XPATH + false + + true + equals + tag + Main + div + + + false + equals + class + Main + LoadingContainer__Container-kdx72l-0 cnWOuY + + + true + equals + text + Main + You have no requests! + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainer__Container-kdx72l-0 cnWOuY"] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Output Checker'])[1]/following::div[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Updated On'])[1]/following::div[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flag notifications'])[1]/preceding::div[7] + + + false + equals + xpath:position + //div[2]/div/div/div/div/div[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs b/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs new file mode 100644 index 000000000..d8959732d --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs @@ -0,0 +1,72 @@ + + + + h1_gfggggg + + a1fc170f-0b98-4d7d-b215-a30c8ce55c48 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/h1 + + + XPATH + false + + true + equals + tag + Main + h1 + + + true + equals + text + Main + gfggggg + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-request-styles_header--3R28zHQp"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG bLOLTU"]/div[1]/h1[1] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/h1 + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::h1[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::h1[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::h1[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Details'])[1]/preceding::h1[1] + + + false + equals + xpath:position + //h1 + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs b/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs new file mode 100644 index 000000000..e44636ebc --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs @@ -0,0 +1,111 @@ + + + + input_Request Name_name + + 381e4370-629e-492b-bd3c-5ca7701548b9 + + + XPATH + //input[@id='name'] + + + BASIC + //input[@id = 'name' and @name = 'name' and @type = 'text'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + class + Main + Input__InputElement-sc-1o6bj35-0 bfCuIo + + + true + equals + id + Main + name + + + true + equals + name + Main + name + + + false + equals + spellcheck + Main + true + + + true + equals + type + Main + text + + + false + equals + value + Main + R + + + false + equals + xpath + Main + id("name") + + + true + equals + xpath:attributes + //input[@id='name'] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('These fields aren', "'", 't required but are recommended')])[1]/preceding::input[1] + + + false + equals + xpath:position + //div/div/div/div/div/input + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs new file mode 100644 index 000000000..f57f705e9 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs @@ -0,0 +1,72 @@ + + + + span_All + + e46b1338-cfb4-4490-afcb-c261879f15a8 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + All + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX kcQtWv"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::span[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[3] + + + false + equals + xpath:position + //nav/div/div/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs new file mode 100644 index 000000000..68d4bcaab --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs @@ -0,0 +1,72 @@ + + + + span_Cancel (1) + + 302d13ea-63d3-429f-8017-1c0869660067 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Cancel + + + false + equals + xpath + Main + id("request-form-cancel-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //button[@id='request-form-cancel-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div/div/div[3]/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs new file mode 100644 index 000000000..5cd570307 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs @@ -0,0 +1,72 @@ + + + + span_Cancel + + d24922ab-3227-4de2-a025-9b61de62c54f + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Cancel + + + false + equals + xpath + Main + id("request-form-cancel-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //button[@id='request-form-cancel-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div/div/div[3]/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs new file mode 100644 index 000000000..35d936862 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs @@ -0,0 +1,72 @@ + + + + span_Draft + + 5e1ee825-c4ed-4fe3-aad4-e969480d9cb0 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div[2]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Draft + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div[2]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[2]/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs new file mode 100644 index 000000000..f04ad3bb2 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs @@ -0,0 +1,54 @@ + + + + span_Login (1) + + 736cb464-f5e1-49ac-b997-9d69349bde84 + + + XPATH + //span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Login + + + false + equals + xpath + Main + id("app-auth-login-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //a[@id='app-auth-login-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] + + + false + equals + xpath:position + //span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs new file mode 100644 index 000000000..8d0b1ce38 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs @@ -0,0 +1,54 @@ + + + + span_Login + + 43ba404e-395a-4174-ad6f-b2c20759c0af + + + XPATH + //span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Login + + + false + equals + xpath + Main + id("app-auth-login-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //a[@id='app-auth-login-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] + + + false + equals + xpath:position + //span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs new file mode 100644 index 000000000..e2c0eb8be --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs @@ -0,0 +1,79 @@ + + + + span_New Request (1) + + 804916e5-5448-43d1-9965-9b4bfe3f5ebf + + + XPATH + //div[@id='main']/div/div/main/div/div/button/span/span[2] + + + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + New Request + + + true + equals + xpath + Main + id("new-request-button")/span[1]/span[2] + + + true + equals + id + Main + new-request-button + + + true + equals + xpath:idRelative + //button[@id='new-request-button']/span/span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] + + + false + equals + xpath:position + //span[2] + + + false + equals + xpath:idRelative + //div[@id='main']/div/div/main/div/div/button/span/span[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs new file mode 100644 index 000000000..512ee9e88 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs @@ -0,0 +1,83 @@ + + + + span_New Request + + 67319848-cfcb-40e6-8718-6ed1d88c2501 + + + XPATH + //div[@id='main']/div/div/main/div/div/button/span/span[2] + + + BASIC + id("new-request-button")/span[1]/span[2][count(. | //span[(text() = 'New Request' or . = 'New Request') and @id = 'new-request-button']) = count(//span[(text() = 'New Request' or . = 'New Request') and @id = 'new-request-button'])] + + + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + New Request + + + true + equals + xpath + Main + id("new-request-button")/span[1]/span[2] + + + true + equals + id + Main + new-request-button + + + true + equals + xpath:idRelative + //button[@id='new-request-button']/span/span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] + + + false + equals + xpath:position + //span[2] + + + false + equals + xpath:idRelative + //div[@id='main']/div/div/main/div/div/button/span/span[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs new file mode 100644 index 000000000..03b281a97 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs @@ -0,0 +1,70 @@ + + + + span_New Request_1 + + c057b988-a971-4de5-80a1-50d6b5f07785 + + + XPATH + //button[@id='new-request-button']/span/span[2] + + + BASIC + id("new-request-button")/span[1]/span[2][count(. | //span[(text() = 'New Request' or . = 'New Request')]) = count(//span[(text() = 'New Request' or . = 'New Request')])] + + + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + New Request + + + true + equals + xpath + Main + id("new-request-button")/span[1]/span[2] + + + true + equals + xpath:idRelative + //button[@id='new-request-button']/span/span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] + + + false + equals + xpath:position + //span[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs new file mode 100644 index 000000000..c0e3b9127 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs @@ -0,0 +1,74 @@ + + + + span_Save Close (1) + + fcb168c3-906b-48cc-8c0d-63697e3b1f15 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] + + + BASIC + //span[(text() = 'Save & Close' or . = 'Save & Close')] + + + CSS + + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Save & Close + + + false + equals + xpath + Main + /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-eMRERa dFsmTH sc-fgrSAo gdmBOU"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[5] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[2]/div/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs new file mode 100644 index 000000000..5953f01aa --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs @@ -0,0 +1,70 @@ + + + + span_Save Close + + 571126cb-8d91-45cd-a433-0545e72d0e97 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] + + + BASIC + //span[(text() = 'Save & Close' or . = 'Save & Close')] + + + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Save & Close + + + false + equals + xpath + Main + /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-eMRERa dFsmTH sc-fgrSAo gdmBOU"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[5] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[2]/div/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs b/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs new file mode 100644 index 000000000..758eef0e2 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs @@ -0,0 +1,67 @@ + + + + table_StatusRequest Identifier + + 66325af3-ebf7-4813-ae5d-9f1d250d8835 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table + + + XPATH + false + + true + equals + tag + Main + table + + + false + equals + class + Main + DynamicTable__Table-sc-1naczgt-0 cFUPVR + + + true + equals + text + Main + StatusRequest IdentifierSubmitted OnUpdated OnOutput CheckergfgggggDec 5th, 2018Dec 5th, 2018-Actions + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainerAdvanced__Container-sc-1s2zdt8-0 cFyKDm"]/table[@class="DynamicTable__Table-sc-1naczgt-0 cFUPVR"] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancelled'])[1]/following::table[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/following::table[1] + + + false + equals + xpath:position + //table + + diff --git a/ui-tests/Profiles/default.glbl b/ui-tests/Profiles/default.glbl new file mode 100644 index 000000000..fd43827fd --- /dev/null +++ b/ui-tests/Profiles/default.glbl @@ -0,0 +1,7 @@ + + + + default + + true + diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy new file mode 100644 index 000000000..a3a10f6c6 --- /dev/null +++ b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy @@ -0,0 +1,17 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +CucumberKW.runFeatureFile('Include\\features\\requester\\draft_requests.feature') + diff --git a/ui-tests/Test Cases/Requester/Run cucumber tests.tc b/ui-tests/Test Cases/Requester/Run cucumber tests.tc new file mode 100644 index 000000000..800064d70 --- /dev/null +++ b/ui-tests/Test Cases/Requester/Run cucumber tests.tc @@ -0,0 +1,8 @@ + + + + Run cucumber tests + + + 76fac551-a5e8-47b3-ad4d-73ca4acc6659 + diff --git a/ui-tests/Test Suites/Run OCWA test cases.groovy b/ui-tests/Test Suites/Run OCWA test cases.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/ui-tests/Test Suites/Run OCWA test cases.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/ui-tests/Test Suites/Run OCWA test cases.ts b/ui-tests/Test Suites/Run OCWA test cases.ts new file mode 100644 index 000000000..18253fdfb --- /dev/null +++ b/ui-tests/Test Suites/Run OCWA test cases.ts @@ -0,0 +1,20 @@ + + + + Run OCWA test cases + + false + 2018-12-11T09:12:00 + + 0 + 30 + true + false + b535506e-7ead-48e8-b30a-3efef1a51e0f + + 09de8a8b-040a-4a5d-a823-53625b8804a5 + false + true + Test Cases/Requester/Run cucumber tests + + diff --git a/ui-tests/console.properties b/ui-tests/console.properties new file mode 100644 index 000000000..c89f16f3d --- /dev/null +++ b/ui-tests/console.properties @@ -0,0 +1,5 @@ +#Wed Dec 05 10:12:31 PST 2018 +deviceId= +kobitonDeviceId= +remoteWebDriverType=Selenium +remoteWebDriverUrl= diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh new file mode 100644 index 000000000..ae604c9bd --- /dev/null +++ b/ui-tests/runTests.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/settings/internal/com.kms.katalon.execution.properties b/ui-tests/settings/internal/com.kms.katalon.execution.properties new file mode 100644 index 000000000..59a525faa --- /dev/null +++ b/ui-tests/settings/internal/com.kms.katalon.execution.properties @@ -0,0 +1,6 @@ +#Tue Dec 11 09:06:20 PST 2018 +execution.default.executionConfiguration="Chrome" +execution.default.timeout=30 +execution.default.openReportAfterExecuting=false +execution.default.quitDriversAfterExecutingTestCase=false +execution.default.quitDriversAfterExecutingTestSuite=true diff --git a/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties b/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties new file mode 100644 index 000000000..11075e853 --- /dev/null +++ b/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties @@ -0,0 +1,6 @@ +#Tue Dec 11 09:06:20 PST 2018 +execution.default.webUi.enablePageLoadTimeout=false +execution.default.webUi.pageLoadTimeout=30 +execution.default.webUi.ignorePageLoadTimeOutException=false +execution.default.webUi.actionDelay=0 +execution.default.waitForIEHanging=600 diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.jira.properties b/ui-tests/settings/internal/com.kms.katalon.integration.jira.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties b/ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/sonar-project.properties b/ui-tests/sonar-project.properties new file mode 100644 index 000000000..b19e55a67 --- /dev/null +++ b/ui-tests/sonar-project.properties @@ -0,0 +1,32 @@ +sonar.projectKey=ocwa +sonar.projectName=OCWA Scanning +sonar.projectVersion=0.0.1 +sonar.organization=ajc_bcgov + +sonar.host.url=https://sonarcloud.io + +sonar.sources=src + +sonar.dynamicAnalysis=reuseReports + +sonar.javascript.lcov.reportPaths=coverage/lcov.info +sonar.python.coverage.reportPath=microservices/*/coverage.xml + +# sonar.modules=frontend,forumApi,policyApi,requestApi,validateApi + +frontend.sonar.projectBaseDir=frontend +frontend.sonar.sources=src,server + +forumApi.sonar.projectBaseDir=microservices/forumApi +forumApi.sonar.sources=auth,bin,db,routes + +requestApi.sonar.projectBaseDir=microservices/requestApi +requestApi.sonar.sources=auth,bin,db,routes + +policyApi.sonar.projectBaseDir=microservices +policyApi.sonar.sources=policyApi/db,policyApi/v1 +policyApi.sonar.python.coverage.reportPath=policyApi/coverage.xml + +validateApi.sonar.projectBaseDir=microservices +validateApi.sonar.sources=validateApi/db,validateApi/v1,validateApi/validator +validateApi.sonar.python.coverage.reportPath=validateApi/coverage.xml From 10472e68d77d39ddd56cae9b83e7297ae76dddd9 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 09:58:04 -0800 Subject: [PATCH 002/226] travis for katalon integration tests --- .travis.yml | 918 ++++++++++++++++++++++++++++------------------------ 1 file changed, 499 insertions(+), 419 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9180f213a..c9eed00d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,419 +1,499 @@ -dist: trusty -sudo: required -language: python - -services: -- docker - -addons: - sonarcloud: - organization: "ajc_bcgov" - token: - secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= - -matrix: - include: - - name: "Forum Api" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - before_script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - helm lint helm/forum-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Request Api" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - npm install - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - helm lint helm/request-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Policy Api" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - helm lint helm/policy-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Validation Api" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - helm lint helm/validate-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Front End" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Scan - Python" - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1 -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - - - name: "Scan - NodeJS" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - - cd /home/travis/build/bcgov/OCWA/frontend - - npm test - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - - name: "OCWA Master Helm Chart" - language: node_js - node_js: - - "node" - cache: npm - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa - -env: - global: - - HELM_URL=https://storage.googleapis.com/kubernetes-helm - - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz - - TARGET_BR=gh-pages - - REPO_DIR=/home/travis/build/kubenow/helm-charts - - GH_URL=https://kubenow.github.io/helm-charts - - YAMLLINT_VERSION=1.8.1 - - CXX=g++-4.8 - - MONGODB=4.1.1 - - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - - SONAR_APP=sonar-scanner - - SONAR_VERSION=3.2.0.1227-linux - - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= - - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= - #SONAR_TOKEN - - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= - #QUAYIO_USERNAME - - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= - #QUAYIO_PASSWORD - - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= +dist: trusty +sudo: required +language: python + +services: +- docker + +addons: + sonarcloud: + organization: "ajc_bcgov" + token: + secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= + +matrix: + include: + - name: "Forum Api" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + before_script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + - helm lint helm/forum-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Request Api" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - npm install + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + - helm lint helm/request-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Policy Api" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - helm lint helm/policy-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Validation Api" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - helm lint helm/validate-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Front End" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Scan - Python" + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1 -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi + + - name: "Scan - NodeJS" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + + - cd /home/travis/build/bcgov/OCWA/frontend + - npm test + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi + + - name: "OCWA Master Helm Chart" + language: node_js + node_js: + - "node" + cache: npm + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa + + - name: "Integration Tests" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + + - cd /home/travis/build/bcgov/OCWA/frontend + + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + + #Install Katalon Studios + - cd /home/travis/build/bcgov/OCWA/ui-tests + - chmod ugo+x runTests.sh + - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz + - tar -xvf Katalon_Studio_${KATALON_VERSION}.tar.gz + - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} + + #RUN Integration Tests + - ./runTests.sh + +env: + global: + - HELM_URL=https://storage.googleapis.com/kubernetes-helm + - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz + - TARGET_BR=gh-pages + - REPO_DIR=/home/travis/build/kubenow/helm-charts + - GH_URL=https://kubenow.github.io/helm-charts + - YAMLLINT_VERSION=1.8.1 + - CXX=g++-4.8 + - MONGODB=4.1.1 + - KATALON_VERSION=Linux_64-5.8.2 + - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ + - SONAR_APP=sonar-scanner + - SONAR_VERSION=3.2.0.1227-linux + - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= + - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= + #SONAR_TOKEN + - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= + #QUAYIO_USERNAME + - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= + #QUAYIO_PASSWORD + - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= From fe5b1d99dc8de31f004447a68ca7749721d8ae6c Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 10:19:50 -0800 Subject: [PATCH 003/226] travis tar tweak --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9eed00d6..c73e75203 100644 --- a/.travis.yml +++ b/.travis.yml @@ -468,7 +468,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz - - tar -xvf Katalon_Studio_${KATALON_VERSION}.tar.gz + - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} From 04a4e9e609e0dc1a1090eed9d5b12d2efce08e5e Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 10:34:16 -0800 Subject: [PATCH 004/226] run tests --- ui-tests/runTests.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index ae604c9bd..27c6b9996 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1,3 +1 @@ -#!/bin/bash - katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From 6c7a58e2adb75b849bddf77153b8838535a12369 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 10:40:31 -0800 Subject: [PATCH 005/226] tweak to run tests it complained about bin/bash --- ui-tests/runTests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index 27c6b9996..b3193047d 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1 +1,3 @@ +echo "Starting tests" + katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From 1d7b8b6bafcce7aedcf75ecb808379bc211d9f9b Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 11:02:04 -0800 Subject: [PATCH 006/226] fixed line endings and project definition for automated tests --- ui-tests/.project | 2 +- ui-tests/runTests.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui-tests/.project b/ui-tests/.project index f129bb1da..55d9e666d 100644 --- a/ui-tests/.project +++ b/ui-tests/.project @@ -1,6 +1,6 @@ - C%%Users%PaulR%Documents%OCWA%OCWA.prj + OCWA diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index b3193047d..c2c00e0c4 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1,3 +1,4 @@ -echo "Starting tests" - +#!bin/bash +echo "Starting tests" + katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From 32cb654ad82135684fe9a4e3605e416efad4ee71 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 11:18:32 -0800 Subject: [PATCH 007/226] removed shebang as travis doesn't seem to have bin/bash --- ui-tests/runTests.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index c2c00e0c4..d9215c0aa 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1,4 +1,3 @@ -#!bin/bash echo "Starting tests" katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From 4fc101a2452a9274139071a54f1106973f5c80ef Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 12:02:56 -0800 Subject: [PATCH 008/226] added more time for things to load in automated test --- .../Include/scripts/groovy/Requester_step_def_ks.groovy | 7 ++++--- .../test_OCWA_keywords/random_test_request_name.groovy | 2 +- .../com.kms.katalon.core.db.DatabaseSettings.properties | 0 .../com.kms.katalon.integration.analytics.properties | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 00a0c0453..05305d444 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -75,9 +75,10 @@ class Requester_step_def_ks { newRequestButtonObject = new TestObject("new-request-button") newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - WebUI.waitForPageLoad(0) - - WebUI.waitForElementClickable(newRequestButtonObject, 0) + WebUI.waitForPageLoad(20) + + WebUI.waitForElementClickable(newRequestButtonObject, 20) + //WebUI.sendKeys(Keys.Return) WebUI.click(newRequestButtonObject) request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy index 281c294f2..863f5e131 100644 --- a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy +++ b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -23,7 +23,7 @@ public class random_test_request_name { @Keyword def gen_random_test_request_name() { Date today = new Date() - String todaysDate = today.format('MMddyy-hhmm') + String todaysDate = today.format('MMddyy-hhmm-ss') String engagementName = 'auto_eng ' + todaysDate //return (engagementName) //WebUI.comment(engagementName) diff --git a/ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties b/ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties index e69de29bb..914aee845 100644 --- a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties +++ b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties @@ -0,0 +1,2 @@ +#Tue Dec 11 11:07:41 PST 2018 +analytics.integration.enable=false From f9ab7e321796ddfb655232cedac102aadec32f01 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 12:22:26 -0800 Subject: [PATCH 009/226] travis tweaks --- .travis.yml | 1 + ui-tests/.travis.yml | 474 ------------------------------------------- 2 files changed, 1 insertion(+), 474 deletions(-) delete mode 100644 ui-tests/.travis.yml diff --git a/.travis.yml b/.travis.yml index c73e75203..02cfb6329 100644 --- a/.travis.yml +++ b/.travis.yml @@ -466,6 +466,7 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests + - rm -rf .project - chmod ugo+x runTests.sh - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz diff --git a/ui-tests/.travis.yml b/ui-tests/.travis.yml deleted file mode 100644 index 202efcebf..000000000 --- a/ui-tests/.travis.yml +++ /dev/null @@ -1,474 +0,0 @@ -dist: trusty -sudo: required -language: python - -services: -- docker - -addons: - sonarcloud: - organization: "ajc_bcgov" - token: - secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= - -matrix: - include: - - name: "Forum Api" - language: node_js - node_js: - - "node" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - before_script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - helm lint helm/forum-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Request Api" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - npm install - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - helm lint helm/request-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Policy Api" - language: python - python: - - "3.6" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - helm lint helm/policy-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Validation Api" - language: python - python: - - "3.6" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - helm lint helm/validate-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Front End" - language: node_js - node_js: - - "node" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Scan - Python" - python: - - "3.6" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1 -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - - - name: "Scan - NodeJS" - language: node_js - node_js: - - "node" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - - NODE_ENV=test npm start & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - - cd /home/travis/build/bcgov/OCWA/frontend - - npm test - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - - name: "OCWA Master Helm Chart" - language: node_js - node_js: - - "node" - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa - - - name: "Integration Tests" - language: node_js - node_js: - - "node" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - python3-pip - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - - NODE_ENV=test npm start & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - - cd /home/travis/build/bcgov/OCWA/frontend - - npm test - - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui-tests - - chmod ugo+x runTests.sh - - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz - - tar -xvf Katalon_Studio_${KATALON_VERSION}.tar.gz - - ls -liah Katalon_Studio_${KATALON_VERSION}/ - - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} - - #RUN Integration Tests - - ./runTests.sh - -env: - global: - - HELM_URL=https://storage.googleapis.com/kubernetes-helm - - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz - - TARGET_BR=gh-pages - - REPO_DIR=/home/travis/build/kubenow/helm-charts - - GH_URL=https://kubenow.github.io/helm-charts - - YAMLLINT_VERSION=1.8.1 - - CXX=g++-4.8 - - MONGODB=4.1.1 - - KATALON_VERSION=Linux_64-5.8.2 - - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - - SONAR_APP=sonar-scanner - - SONAR_VERSION=3.2.0.1227-linux - - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= - - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= - #SONAR_TOKEN - - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= - #QUAYIO_USERNAME - - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= - #QUAYIO_PASSWORD - - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= From 42573adb1acfc5879b203bfdfa9899cd8e52df95 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 12:30:20 -0800 Subject: [PATCH 010/226] added Travis testing url via Profile --- ui-tests/.gitignore | 1 + .../scripts/groovy/Requester_step_def_kr.groovy | 4 ++-- .../scripts/groovy/Requester_step_def_ks.groovy | 4 ++-- ui-tests/Profiles/Travis.glbl | 12 ++++++++++++ ui-tests/Test Suites/Run OCWA test cases.ts | 2 +- ui-tests/runTests.sh | 2 +- 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 ui-tests/Profiles/Travis.glbl diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore index 91344686a..c295d3bb6 100644 --- a/ui-tests/.gitignore +++ b/ui-tests/.gitignore @@ -214,4 +214,5 @@ venv.bak/ # Katalon Studio Reports/* +Profiles/default.glbl diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy index 88dd0897e..eeaf81f58 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy @@ -41,9 +41,9 @@ public class Requester_step_def_kr { WebUI.openBrowser('') def driver = DriverFactory.getWebDriver() - String baseUrl = "http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/" + String baseUrl = GlobalVariable.OCWA_URL selenium = new WebDriverBackedSelenium(driver, baseUrl) - selenium.open("http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/") + selenium.open(GlobalVariable.OCWA_URL) selenium.click("id=app-auth-login-button") selenium.type("id=username", "xxx") selenium.type("id=password", "xxx") diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 05305d444..caa99a049 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -58,7 +58,7 @@ class Requester_step_def_ks { def requester_login() { WebUI.openBrowser('') - WebUI.navigateToUrl('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) @@ -76,7 +76,7 @@ class Requester_step_def_ks { newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) WebUI.waitForPageLoad(20) - + WebUI.waitForElementClickable(newRequestButtonObject, 20) //WebUI.sendKeys(Keys.Return) WebUI.click(newRequestButtonObject) diff --git a/ui-tests/Profiles/Travis.glbl b/ui-tests/Profiles/Travis.glbl new file mode 100644 index 000000000..feb3f8808 --- /dev/null +++ b/ui-tests/Profiles/Travis.glbl @@ -0,0 +1,12 @@ + + + + Travis + + false + + + 'http://localhost:8000' + OCWA_URL + + diff --git a/ui-tests/Test Suites/Run OCWA test cases.ts b/ui-tests/Test Suites/Run OCWA test cases.ts index 18253fdfb..e4a6e327b 100644 --- a/ui-tests/Test Suites/Run OCWA test cases.ts +++ b/ui-tests/Test Suites/Run OCWA test cases.ts @@ -4,7 +4,7 @@ Run OCWA test cases false - 2018-12-11T09:12:00 + 2018-12-11T12:11:17 0 30 diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index d9215c0aa..eca6a0d3c 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From 1f09d2b8121a0c66854adbb97f066ff405da9579 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 13:04:50 -0800 Subject: [PATCH 011/226] start ignoring local default profile --- ui-tests/Profiles/default.glbl | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 ui-tests/Profiles/default.glbl diff --git a/ui-tests/Profiles/default.glbl b/ui-tests/Profiles/default.glbl deleted file mode 100644 index fd43827fd..000000000 --- a/ui-tests/Profiles/default.glbl +++ /dev/null @@ -1,7 +0,0 @@ - - - - default - - true - From 20c09e62fd5e5e68c1f310d76d0188ff624effd9 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 13:10:21 -0800 Subject: [PATCH 012/226] added pip to integration test travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 02cfb6329..da75452ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -405,6 +405,9 @@ matrix: sources: - ubuntu-toolchain-r-test - python3-pip + packages: + - g++-4.8 + - python3-pip before_script: - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz From 9f574620659916760263ebd767039e4d7f30ea15 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 13:13:31 -0800 Subject: [PATCH 013/226] changed how katalon studios is run: --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index da75452ae..f3077ce32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -469,15 +469,14 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - - rm -rf .project - chmod ugo+x runTests.sh - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} - + - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - ./runTests.sh + - ./ui-tests/runTests.sh env: global: From 252e945fdd7891671c3e09f6afd8625fd0c96c70 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 14:01:22 -0800 Subject: [PATCH 014/226] added bin and Lib folders to repo (which apparently we need) --- ui-tests/.gitignore | 2 - .../groovy/Requester_step_def_ks.groovy | 4 +- .../random_test_request_name.groovy | 6 +-- ui-tests/Libs/CustomKeywords.groovy | 9 +++++ .../Libs/TempTestSuite1544564949373.groovy | 36 ++++++++++++++++++ ui-tests/Libs/internal/GlobalVariable.groovy | 33 ++++++++++++++++ ui-tests/Test Suites/Run OCWA test cases.ts | 2 +- .../bin/groovy/Requester_step_def_kr.class | Bin 0 -> 6547 bytes .../bin/groovy/Requester_step_def_ks.class | Bin 0 -> 6842 bytes .../random_test_request_name.class | Bin 0 -> 3283 bytes ...s.katalon.integration.analytics.properties | 2 +- 11 files changed, 83 insertions(+), 11 deletions(-) create mode 100644 ui-tests/Libs/CustomKeywords.groovy create mode 100644 ui-tests/Libs/TempTestSuite1544564949373.groovy create mode 100644 ui-tests/Libs/internal/GlobalVariable.groovy create mode 100644 ui-tests/bin/groovy/Requester_step_def_kr.class create mode 100644 ui-tests/bin/groovy/Requester_step_def_ks.class create mode 100644 ui-tests/bin/keyword/test_OCWA_keywords/random_test_request_name.class diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore index c295d3bb6..eb01e3d7a 100644 --- a/ui-tests/.gitignore +++ b/ui-tests/.gitignore @@ -206,8 +206,6 @@ venv.bak/ # mypy .mypy_cache/ -/bin/ -/Libs/ /.settings/ /.classpath .svn/ diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index caa99a049..70de81198 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -75,9 +75,9 @@ class Requester_step_def_ks { newRequestButtonObject = new TestObject("new-request-button") newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - WebUI.waitForPageLoad(20) + WebUI.waitForPageLoad(30) - WebUI.waitForElementClickable(newRequestButtonObject, 20) + WebUI.waitForElementClickable(newRequestButtonObject, 30) //WebUI.sendKeys(Keys.Return) WebUI.click(newRequestButtonObject) diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy index 863f5e131..e5d4f4f11 100644 --- a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy +++ b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -24,10 +24,6 @@ public class random_test_request_name { def gen_random_test_request_name() { Date today = new Date() String todaysDate = today.format('MMddyy-hhmm-ss') - String engagementName = 'auto_eng ' + todaysDate - //return (engagementName) - //WebUI.comment(engagementName) - //return "bananas" - return engagementName + return 'auto_eng ' + todaysDate } } \ No newline at end of file diff --git a/ui-tests/Libs/CustomKeywords.groovy b/ui-tests/Libs/CustomKeywords.groovy new file mode 100644 index 000000000..9457decb7 --- /dev/null +++ b/ui-tests/Libs/CustomKeywords.groovy @@ -0,0 +1,9 @@ + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ + + +def static "test_OCWA_keywords.random_test_request_name.gen_random_test_request_name"() { + (new test_OCWA_keywords.random_test_request_name()).gen_random_test_request_name() +} diff --git a/ui-tests/Libs/TempTestSuite1544564949373.groovy b/ui-tests/Libs/TempTestSuite1544564949373.groovy new file mode 100644 index 000000000..3f196e0ef --- /dev/null +++ b/ui-tests/Libs/TempTestSuite1544564949373.groovy @@ -0,0 +1,36 @@ +import com.kms.katalon.core.logging.KeywordLogger +import com.kms.katalon.core.exception.StepFailedException +import com.kms.katalon.core.reporting.ReportUtil +import com.kms.katalon.core.main.TestCaseMain +import com.kms.katalon.core.testdata.TestDataColumn +import groovy.lang.MissingPropertyException +import com.kms.katalon.core.testcase.TestCaseBinding +import com.kms.katalon.core.driver.internal.DriverCleanerCollector +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.configuration.RunConfiguration +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import internal.GlobalVariable as GlobalVariable + +Map suiteProperties = new HashMap(); + + +suiteProperties.put('id', 'Test Suites/Run OCWA test cases') + +suiteProperties.put('name', 'Run OCWA test cases') + +suiteProperties.put('description', '') + + +DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner()) +DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner()) +DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.cucumber.keyword.internal.CucumberDriverCleaner()) + + + +RunConfiguration.setExecutionSettingFile("C:\\Users\\PaulR\\Documents\\OCWA\\OCWA\\ui-tests\\Reports\\Run OCWA test cases\\20181211_134904\\execution.properties") + +TestCaseMain.beforeStart() + +TestCaseMain.startTestSuite('Test Suites/Run OCWA test cases', suiteProperties, [new TestCaseBinding('Test Cases/Requester/Run cucumber tests', 'Test Cases/Requester/Run cucumber tests', null)]) diff --git a/ui-tests/Libs/internal/GlobalVariable.groovy b/ui-tests/Libs/internal/GlobalVariable.groovy new file mode 100644 index 000000000..51b9af8e5 --- /dev/null +++ b/ui-tests/Libs/internal/GlobalVariable.groovy @@ -0,0 +1,33 @@ +package internal + +import com.kms.katalon.core.configuration.RunConfiguration +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ +public class GlobalVariable { + + /** + *

+ */ + public static Object OCWA_URL + + + static { + def allVariables = [:] + allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca']) + allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) + + String profileName = RunConfiguration.getExecutionProfile() + + def selectedVariables = allVariables[profileName] + OCWA_URL = selectedVariables['OCWA_URL'] + + } +} diff --git a/ui-tests/Test Suites/Run OCWA test cases.ts b/ui-tests/Test Suites/Run OCWA test cases.ts index e4a6e327b..41a580f83 100644 --- a/ui-tests/Test Suites/Run OCWA test cases.ts +++ b/ui-tests/Test Suites/Run OCWA test cases.ts @@ -4,7 +4,7 @@ Run OCWA test cases false - 2018-12-11T12:11:17 + 2018-12-11T13:49:04 0 30 diff --git a/ui-tests/bin/groovy/Requester_step_def_kr.class b/ui-tests/bin/groovy/Requester_step_def_kr.class new file mode 100644 index 0000000000000000000000000000000000000000..a2f422bbd2e87f2019711b1a50b0e033bc47c755 GIT binary patch literal 6547 zcmbtY349dQ8UJ3g$!<0SBm)E@sH>(DHd$9zt4KtFC=f}2l7tAfT_?M<*&(|#ab`AQ zd#JV8YOSqpZEbDU)~eLjwup#{SLvnJUiPr}ec$(e*#5tn+0AUSLH$8~yq)>pcVF*& z^VG8sJw`;U#EF6y?@%u6;J9)UKJ$wPHWq5o0>iXoTfI*R%|WRol`8U zN6#37qP>PW5>FXvHLDb?xMz&1W^yo4GxT^F7xcko5*+%v1&Q5)8uF^GINO4j^!nY< zSK0tg{rQ@%*%t_^ZC|-lBAFJ3DL{(^HMfnZcDItt^=r1e-ZYh>phWx1J=GN|=(d(u z<0;@k**yCiC%C1I+erGgeR%YMhivI>G)+gHw^okS^C09VK zmKMtlBU#0Yfa!>uj%a!h4slwqoz6a_6lsuqzfX-R4{tdO$&u8STQsLBCKU9tz73qrpyhq#hK*2)h^uP0;B&+cJV$+I#%o z^N`R{4H^rRPM0&IMx2T812l+v?8|<#C7MqQ*uCR|&Nx=UOQB{FW=2V=tAn%;ojI*p zT$E|_Y(1@*X)O;xucvc00O`w!phX>lc8#p(GP ziNe&#dcT&>O^7z~Zly_d4V}gZ!s}SzJUEL@cfx<2pk=&kgk1y?1VwvtA{9xK?%jFwYz3PpXv#&*QrjX1jz+lcsN3R*F( zAkLAbZrI7P29-HD&y*m6kJyQU>nLh=h~?=JYg{dX0Mqg|FC-( z2s#DsEoD{4F!M1+jiqvirIxeooj^+&dPXzz$+W3tU=xs%6EM&!q*AJ7WeO;oIaC^O zRT`M766UO2Ix?(AIRDs@rW(Uxp!>ZLL1sk8wA5&%Fcz7}swNP#YB7>iGj_ztWY~x% zUYaY4ZG&OtR7DTc?ObBJ{UzpYIVJYKFuj-VU~*Z|e5Y0mww8-uq}Vv6?vkj-J(CVF z%0lFRUtc<1EXK0gd_F`UWGJSn2J|l@sp=z<5PcXUg>9sHkZN)pc9|ijjj*$2F?+}Z zg)*Y%QAb;yc`?Mp7>|XRqAG?Nx64X&KON@5?Eyjac%buDYDbkeJ@>@*AWd>>o{~tS zd0c}J3u>?0JF3i}L3$JwTT<1XVAuM^m(GOe%Mg+H7#$7MWAt&CaoH}3KFPD;WArI( zSgPOP6Ds>onWSswPT*?#xG|~%m^IQf#wYKve_n?vcOi&gTy?Gv(r2IZ-)?8=_y}9=xr4Xnk^UM{kIJ1?|soL&LYc5w-1t5d8+%5#|!2 z-=W8)a_Gq+`U79pFerxTPoSAlG<&0AZbw(^H580te+khwA=-=9jO((NDGsRnkXx#S zmKUObU>f5CN5S*Iz-KI1utM}7+~lg6C+Hj`L)D%#*A>dS&~|Z?UM$g1=%*-Wfjdy* zg)<2X4E`0R;5NCc-o^!6)P+Sr)Jyau`Z4;ez!!(xAYoSc}AxgoK$yG>Ul= zJxl*%g>gbxo)apZS7s?qZQx+yGr$5P)u61b8qukdCFh+5n%; z2yL&Xt6QCGv+9&>R#8p?8gAU&Qgk zA(=q4JWEPRuot4M=iYsCq`JsqA7P!#^_0A?q=7o$O3nskcO6?7)uNUP`$N{D5^ zZG@NF@c%^?$OO;DuEQ{J1n@^xbRCw1!)hnVESX`sDi+-LLo{&(Mqt;%RBP8EgmYl#FOAfJQF`IF{k8wS41JpB<;adQH>v1sLK9k|w!0@Ir z!*wu+HEeOCeX|>mcg;#bHx!Fz={s0v|90?2GQ9&ox0Kmm3X_<9)MbC`jAXhE?;Lp~ z*!$;*e!EX3&t?JIjp*+wi+#5%_C5H)9nxzXx5Fwf`Yo>5I}`HVQ}lrvlJ9oP_im@$ z?@4sZA94)!)%(2(`6DQIvz`>#DF7!$CNQRUM9;YWf0@;&T zAMF4RcTr~eBz?x)Z-u_xb>~6$Q_+sjDf(gnCc0=()0aH7rC#nxF4`1*wYH4)41H}* zX5S3JPyA2Nx9Hm*S~K3*h&re|;K;)3cj&v`c7@6VCGzjl_p6ZaFOmO%eprosziV-r z=L2v5dYHn}uZ+qogv;)b> ze+9&Hp0AMqhUaUY-5cb;eyf9XoBU5e?sPccBmW!E_sak6FDZsOz*Fp0gn|`o z!A literal 0 HcmV?d00001 diff --git a/ui-tests/bin/groovy/Requester_step_def_ks.class b/ui-tests/bin/groovy/Requester_step_def_ks.class new file mode 100644 index 0000000000000000000000000000000000000000..86527bfc8ec96fe1b2b1fec6a80f26e53fab5d8c GIT binary patch literal 6842 zcmbtZd0-UP8UJ3g$u7wPVIV*daVb9kJJ@`~ivxj2Htrpqm*t9dC%Nlddy+NP!tZx*yzm*XCluA*%lx=UWr+CnAc%srQcy!$wd_8lZ=wJnpB?o%*>jF>$FbMuR^N^X6Q)(Px`CcU&ka)pHL?b4 z!W4GDS_Lg+b0r=3mCY-tCE8lW@?mPDwQQI6FfAa3>BR*F>=DgkcU6pAxNE)_MaYkw zF|6r=7Jc_Lj*7xP2XjH?AL?m$RAzFixWI_T7msktJ|v7}5dGNM`$&>WVT zh^E&fAqm#1=%H~rRMg_5a$?*tGw}gA)US0FwVb^}?{W8#u;&PBKc2g0MM{t$R)Dt! zZ9Kk{JS8jW9i}aGUL&1L=d%KWml`Ok>4*hg&BeFpj3G6*S2ZJhZb-Hl9d$M>ki zGPS#VpfhrT9FsYtke9k0*(*(p)7~nmdMd#Y5TczXCUg`y1P(?H_N1Q}#BVwe-)wre?igv2sVms$$#4sZ=uWGqe(b)-6Kgv@98Jd$5 zAsP^LQ3WHHTI4CMY>Xu{y&Dm?4X#v2CSDc@n%7-K&(BX6 zzgI9Xr#8G2k#f8;Xv3f*s-DSV*oY@b4AW*4U+C=w=~akAw|%(-$%(6zH@Jl9HT2pB zdNsXn#^mIl2I&nfy28ssLEEdOO4aJ)CVQ_tJVkaP;hhO8L~j(drX0B`bd;2C*eR=9Xta6zX`Q&KY-D`gaIt}$6HC($EY%cl{XM%=@QbI3)h z8YK&(*D<+vO668LFyeH|l|D++j5zpAT{BCPvK1EzTHy)Qp2dXM&T#E%p7F|g`7Q=* z=4CN2O9ZV<8+ukV^QnxfW??7bq{d-1tC&tp%gPqf3#&-i=Sr76M!FHBn9D?lWQ6-0 z+rgCW=xeCc)0T}Ox*`QFJsK$%BI6^{1mK9Ah~#9}ju_c23%8UPjBFtu0(l(8gfnB% zaQjM_-b?rJ!1z8vb9s>T%|2}v(!2UJ^a1)HPgfrb(_EUz)6hXd(TbT>I( zRCjXT;%8qP>z*w^Wcz(|e*+z+BQD{xUSXQ#x$Q7b;lPr9g_lLE%zCYR0jud_#;63H z5d-Ca#)RXg?6az3JTiiHbH#Z+NJmfDSx<&pm>#B&H`2%G6M`CH-YPSaN77$4y_$QB zqTa4g(dwvSdXye#-k$<*79^B{rTkvanbdB}h+8%>Rp5r%kEavfGcA+Q3cuG9RkXl8s#5 zx=dpnb7qLXi!!9EW7;ri^cnqTE=1o)5#vUd>hDd2=!dxaq;sf!A^I^IcUIFg)3yxJ zPcgzkvp#vH9ipG3bK=KVJ#9|lG6_K5{U!W-?rIcn%bTrMpBJKEBSz7MN--Lu-{NMy z_2T}{L^4Fb2gbOn*)S9j^$A18?Da=nOT5jkImxqqH;ct(J4AmLbRl0EocTZHU9_xq zCJMKaPdO)EvvKD%-jE>i!-bHT|I3DVOTA^ch6mhOt)$8!a)KJ<(bVfrS03tdChqG3*t zrn5pUDC+Rifd~(aAf4GD>P09_|DbV&LNm z2+wT`@k;}KJ^uE@9-zgOv@D@4-?=uHx}R389T2o(Q3)G^HZmb!s^K~9K8Si@iypl!5)I(U!HpflkFX8R=7fickmX4$4}>`*o- z%cto1wKUMCbmCW=($%3{Fhv)l6?)q{ob8J`l!UTtih66y2TA9kj}P`b2g)T=bXkB& zUG5z11-CRcpXjQwS>Re(0bo?EDu&ZjQwqp@_G1omPKddPqwV@Qw}20Ay?m#4ke=OpQ3y%?Of}(XLK!u);nVNQB*0k zDOYqTmSY2De_)a(rs&1>tku;Jy=lcHT~jj6wb)=BZ`0NNI&ZTCbbW_%!xY_EL%Z51 z>GenHCdbX~pm(!liUVwlH#w#Ntrd=)W}D-n&m1cdh5_oqOqYNWc2OVgK|uA=1ilX7 zIp7$R48tUEE}NtSzc>U!Y!We>QN52*JzxVgcr3xUVEe8A2f=;E5_}s7zP(KF1~`oi zUcc+KTi9v0R&ZL3opu{LEyhl}z3jAG{Z6~Xbw|u`$82?zK6U4TZGeVg*EH;!DNFed zh=aukk2RO|0Gzmp_Lted$7OqG zQ-B{dy~1$@0GaI?r2qSsnmZ{30X}^25Z#+-dz|L;?j$`hm^e)LwjH4dIjg8i@MP@~ zSOs*v7t<2hZT;Y56gW5#8$>BV5#gN@!b9{C4?*!b*2mfa!&Qa}K1`2z=PeMN-8C1y zKN@RWJ4K&_wjS7{^q2>>6hJI^*ae%SPuG^Ao}kZECHDCMIXofs7wC%~*aG}wCF(e1 z9A5bOBz?&{o+0vz68e|vD;3bACG@Y-*D9e$OXy#(h#o7Uf1@&b%r#g8_im5;J+K4| ze@jf+sC+LOQ#zF&VC_e+W8()euI5o z`5o3Pls{m-TKN;!Yn7+4UgtnwulyC?H#^i0I9RthShqP?w>wyOIFNTaxOXdmPnN_+ z2lvEY2|u&g&C0(Xrki>YcK>;Zo*7hXVh@NK*WV5NKN24JnVy!>Ln81PEx>w2%sC2# gp2ta<6pcL(iTXjH&O0muvHOJL*-(^?7A{_6pD15!5iW&6|d?RCdo# zJKq)R28PaR8uz$jq%~&Qs;y;53aVwD)#nU`M9MJdm8_BDd9`FIo&l53709S&=*k-J z07E2`Aq`_A4D2#PeUaO$LuS~T^1C)xA&^Y%pr&i~5JOG8XHr5VnxY7!nV}^%&+QSl zP)KVwA2v<3%+Me2nF)5Nq}y7ND_P>Vh+nA)4oHx(DT)v_Gi(wn(@uzME-Ux3RJc42n|on`||l>vCp#Vu#ZwHqGUMybQ^9D1smCq z10vYx8IC?JSes(WQ$rUt>ezJNFl`at8Sf;5LkyA|b=o$G=fB~0`KY{);Aj+wLABx= z3NAH*Vw)7M6kF&;BE0Lqorq(cr|^=Sm2~5Z{!}U zLJw^p{?)5cOeiwFC2+(>@EXH8f8d@XpX&7(lQ4tV8<2s@&_M8BFpWiS+Eh%B37IEBYw`R#(m&aaHr*z#}#3Hfrd#;Ob*{> z+ToL+?Wm-UIr|cy<0jX$oZ6~2mNhx`RAnzY3oSzK~4K+P9kER<-Bm1uVaDQ7rH-5FTj)h55=l(R@`Bp6r}h4m(F-SsPp;BAIS zlH#^oV60;6zZ=CncuztRy6E%|7&;zq!zTcZ;6u7FQ1wap2%S;fz{e7<;SJ&Nr_>1n zId(4>p9$X2X#lG3g<|jeuM=P5t9tVFYf8WfEiN%64Jw97)zsA40-q2M%3ey-`T0_D zmYd#5`z06lNzKxTWq56aQ!1lrqhx0JDXqZKMKOeFk=G*J92JufXugRk8t8ppTtny` z6*$pkZx9O~P4xVh{v9AmG4ERwzoTUZTT+QTXdmlMWPU?O@6<0uVfc=o61~G{!FKF$ z&YnRhNeT@&NIp#OAt9ZVyZYtsRrG`)cdtOXhwic7sieHOzgO;G#lae^VDKJ>&iB#b z@qT%@&pBLX%cLRXSla3MGw4}rLkuS{LbN{e`6ON>>i5Lk=vZyXHu@>(zz=j*OFr(T zNWv!-LqDS~v4XMXTNqCzAD~H`uHdEV)NPC>@8D(OhPX)5aP|~* zlQ^Tpt%+aJF?}E5<*CFpVMO?dlZwDJE_(v9XR$VsBp!jFP&k8EJbF8!B@o|8wqH#o zdsi_VMnz2)IghQ4n1th!%eIR7nl-LGw5rMqVYoJLw38`lZ3ZyXII`y=@iLgZh}^Nc9~ literal 0 HcmV?d00001 diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties index 914aee845..20d3d6ab8 100644 --- a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties +++ b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties @@ -1,2 +1,2 @@ -#Tue Dec 11 11:07:41 PST 2018 +#Tue Dec 11 13:13:12 PST 2018 analytics.integration.enable=false From 7e8621658bfaffbc03c3cb181e225be830641fd0 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 10:16:41 -0800 Subject: [PATCH 015/226] added some classes we need to run Katalon studio scripts successfully --- .../Libs/TempTestSuite1544564949373.groovy | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 ui-tests/Libs/TempTestSuite1544564949373.groovy diff --git a/ui-tests/Libs/TempTestSuite1544564949373.groovy b/ui-tests/Libs/TempTestSuite1544564949373.groovy deleted file mode 100644 index 3f196e0ef..000000000 --- a/ui-tests/Libs/TempTestSuite1544564949373.groovy +++ /dev/null @@ -1,36 +0,0 @@ -import com.kms.katalon.core.logging.KeywordLogger -import com.kms.katalon.core.exception.StepFailedException -import com.kms.katalon.core.reporting.ReportUtil -import com.kms.katalon.core.main.TestCaseMain -import com.kms.katalon.core.testdata.TestDataColumn -import groovy.lang.MissingPropertyException -import com.kms.katalon.core.testcase.TestCaseBinding -import com.kms.katalon.core.driver.internal.DriverCleanerCollector -import com.kms.katalon.core.model.FailureHandling -import com.kms.katalon.core.configuration.RunConfiguration -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import internal.GlobalVariable as GlobalVariable - -Map suiteProperties = new HashMap(); - - -suiteProperties.put('id', 'Test Suites/Run OCWA test cases') - -suiteProperties.put('name', 'Run OCWA test cases') - -suiteProperties.put('description', '') - - -DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner()) -DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner()) -DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.cucumber.keyword.internal.CucumberDriverCleaner()) - - - -RunConfiguration.setExecutionSettingFile("C:\\Users\\PaulR\\Documents\\OCWA\\OCWA\\ui-tests\\Reports\\Run OCWA test cases\\20181211_134904\\execution.properties") - -TestCaseMain.beforeStart() - -TestCaseMain.startTestSuite('Test Suites/Run OCWA test cases', suiteProperties, [new TestCaseBinding('Test Cases/Requester/Run cucumber tests', 'Test Cases/Requester/Run cucumber tests', null)]) From e018f011f8c91df252defe682a9ad6a612c21738 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 10:17:14 -0800 Subject: [PATCH 016/226] same comment as previous commit --- .gitignore | 416 +++++++++--------- ui-tests/.gitignore | 215 +-------- ui-tests/bin/lib/CustomKeywords.class | Bin 0 -> 2440 bytes .../bin/lib/internal/GlobalVariable.class | Bin 0 -> 3510 bytes 4 files changed, 210 insertions(+), 421 deletions(-) create mode 100644 ui-tests/bin/lib/CustomKeywords.class create mode 100644 ui-tests/bin/lib/internal/GlobalVariable.class diff --git a/.gitignore b/.gitignore index 582f48e92..855dcf914 100644 --- a/.gitignore +++ b/.gitignore @@ -1,208 +1,208 @@ -# General Ignore -#bin/ -.idea -.DS_Store - -#Helm -helm/ocwa/charts/* -helm/ocwa/config.yaml - -# Golang Ignore - -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - - -# Node Ignore - -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - - -# Python Ignore - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ +# General Ignore +#bin/ +.idea +.DS_Store + +#Helm +helm/ocwa/charts/* +helm/ocwa/config.yaml + +# Golang Ignore + +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + + +# Node Ignore + +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless + + +# Python Ignore + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +#lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore index eb01e3d7a..36e75220d 100644 --- a/ui-tests/.gitignore +++ b/ui-tests/.gitignore @@ -1,216 +1,5 @@ -# General Ignore -#bin/ -.idea -.DS_Store - -#Helm -helm/ocwa/charts/* -helm/ocwa/config.yaml - -# Golang Ignore - -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - - -# Node Ignore - -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - - -# Python Ignore - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -/.settings/ -/.classpath -.svn/ - # Katalon Studio Reports/* Profiles/default.glbl - +.classpath +.settings diff --git a/ui-tests/bin/lib/CustomKeywords.class b/ui-tests/bin/lib/CustomKeywords.class new file mode 100644 index 0000000000000000000000000000000000000000..e35c7625d27b56f6bd4897607c207ced44826497 GIT binary patch literal 2440 zcmb7GZBrXn6n<_<*<`ydVR^AFtrd-sY%D1O>kG6B(F#o{+Efs+#$|H}3&}3sY*2ne ze~90)?eJnp$4_>~ALV%N?k0p`VeDk)ZgTH=dCqg6b2k6{`}>~&#?fTBoNqQcC$6zs%A@uV{W?=x)=sd+K%~V42fjJ)m_ub*YrkX-deXAw4&`) zvxZ&a8+x;m4FWoRy~YjKw5@F0c8WnNmnp(Ro`HSO&^>KhrhAW}E0tbSAmgHpC=`a? zWR<&ly;dukE}wB6eU~AZO0R~eYFe&Y=UId78)TntIZi3Kj2;;gBp9OZhS{J3iYF^0 zOjlCHP8McOt72N!DIZb4Kr}$W4cl`0FD_9NYE231x@j>CrdEra`i>q@>N@Duh@!B?bBwS~>b)NaDdL_I~FvK>)gH#8K#kEbki>d#!lRj;v;2jKK z#7(?Q(RHUvEcS)eNVn)TiGco8NDPKKmp9zrya}NpbLi#$8g}b;kg?(IIUbPuY^a z?mpt{+~JnNiK4-z;c(sM`A)Yo-Ey3C?K2z0BE$9b)EUD!q_XKGjf zZ~iu@!-^ADdTB-T)F1TvE7~NICEYRgwHkjc7P`HnY4L~6`WknF9l2yT9fRLDYaGLb zGb+eW$f6m5#52SYr>86!pp!Vwd3u%6`jmc+(la7-^@bYJj__U- z%g2#Keo*ct-uLp4cwhzS5jqi|W5S>9u|4m+g&9=1k2#K1+h>9hi+DriQ_$3OPE)m< z`oR%yM{tB(1g$U)GU_JNC}N2yCNN3gMbZgMDUyzA`}kCi{EC=%h|l+)W44%ijUKUk zh`E*G3(RKrQ4p8}=_K|bz|86C3`46lV zDAnpKJXs-{4)9YeHvN4F%qN4`spnYx8@;sdqxu&)6kbC;gjsln$_lyGUSLgoiES?e L`MQ)Mf(!ovcZY>G literal 0 HcmV?d00001 diff --git a/ui-tests/bin/lib/internal/GlobalVariable.class b/ui-tests/bin/lib/internal/GlobalVariable.class new file mode 100644 index 0000000000000000000000000000000000000000..67d8e66bc00c8743a6060f8689a3b7d558952a5e GIT binary patch literal 3510 zcmb7HYj+b>6x}yXn=~Dy41zpFMXOCGZBq&Y@=$9PgrAAbR`3116bVU<18 zE$eo6ukB3f_7UB+^eNj+KnQdm(`WUpt(T{>2d9pihL=E#z?x~-ac1WN`Ck9KzS}CW zYN?<8Kv^JpaCm%Z^6tYq0X6qezdISLtLo{VWenSTwYsldbOf}V<4$J{r(l-!S~VMn zb{&Br)}Vfs`q{eSP6d}^RSGez7Fa1= z=6#5ZDG01h_cX~)!5XZUw(AsJhUM-2x>6wSm8>ewa!rnnppv@`JA}2VA%9`IdBe3T z-feT9DH$Fr=oMas1U8a9!!>o!9MvlVUFoA2pH@#Gs(F^3r515shprT^#q}+`SKwh3 z%%Wbiy(H2}BnA3Po>$qC%{s;jz0W8VtiFQn^%cz7{)+CEidMN`y8YA6Z2y$eZ|F&6 zX!38lUqp2ReI!SU1@@;e&iMaGLR69KPGDIKbf6!bBrsM)+nB4*TGb@BNI^_4tcdOZ zD`FG>+ok`TSU4d^wnG>tr|Rw4J}@wl#7-F`F0k2fX0pd;s@dbZr`x>!hU4FIx4PH zv~2T$K4UIzHDMH1ch!^~#4JS2lCt1s>tUs`CNDH7U&z$*7?aK6Zh>X8x*|24X~=Km zo}*wK_sB|_P>@20gm6?K-H`4EeJ+9f3AmnW&?R?A!w1>+H11Ok91_?h9!%i@=z-%! zTnY@?e;z=A8&xw3cwM?l&+0isU8_9n95?BwRQ5a~VSIu+CP*!7nbPw28iw*LScVu%23ZmOUHSH_l?mqcHP z-5ovI=5R>*O;OFJ!6WI^dFRxt;e?F-u)t+qvVlfM-iC+;$8I+76urY{(R9tSVRF>0 z?g}QwaMWya6E~JjjXHKF+ES@;C_KSlU9oFyqfZI6lJ6l3PqOm(dB?-1!NKB`$%Cxp zB%T$xyip*5t*q3BrPFL8`=i`%s0js+;c_N%FEg&6^Vb%7kRxEV z_5)VV^KGY{$NJG;ZSs3;=pFxtI|5&DRrohftE+G|e40jKz zw=Cec80K;3uh^f<`0hpqwTy2*+Ux($4fd*!;RL#I z2zL?Q3%CM@DU0Dt%GZ%pP?F-iQNvnx@Aa6&2AslGopJe=3<=y!{TMa7N!$@N_BE2) zJnlXFE$+)@e#detoyXKf?i}vRoQHXqs^}DQ7=#Y4qq&fwwC}KC;y1+4j%yP<1Rj8t z)D4Q54h_^WVw;wsjyxjiummgIU(4f=N4ku$k7=3S1vqik-Bj>UsJ4bmGI1qPTY%TH zs8z#kQ)hE=1Tj;x;zPA=p5c4lb`t>X!{lOj3Mzig1EdE literal 0 HcmV?d00001 From b0704098f13c3b25b25adc71c9f2ffa7815f7842 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 14:48:00 -0800 Subject: [PATCH 017/226] Commented out the the GlobalVariable class reference --- .../Keywords/test_OCWA_keywords/random_test_request_name.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy index e5d4f4f11..c63222c61 100644 --- a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy +++ b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -16,7 +16,7 @@ import com.kms.katalon.core.testobject.TestObject import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable +//import internal.GlobalVariable public class random_test_request_name { From dfbb9e2145101188ff74a0eb7aac6ff96099b716 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 15:15:36 -0800 Subject: [PATCH 018/226] changed the path from backslashes to forward slashes --- .../Requester/Run cucumber tests/Script1544053608217.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy index a3a10f6c6..f28816a4c 100644 --- a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy +++ b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy @@ -13,5 +13,4 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -CucumberKW.runFeatureFile('Include\\features\\requester\\draft_requests.feature') - +CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') From db82204d6adf49bbcf63852262be6ba15e9cc722 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 17:07:25 -0800 Subject: [PATCH 019/226] updated the version of Katalon Studio to install to 5.9.0 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3077ce32..33548c927 100644 --- a/.travis.yml +++ b/.travis.yml @@ -470,7 +470,7 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh - - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz + - wget https://github.com/katalon-studio/katalon-studio/releases/download/${KATALON_VERSION}/Katalon_Studio_${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} @@ -488,7 +488,7 @@ env: - YAMLLINT_VERSION=1.8.1 - CXX=g++-4.8 - MONGODB=4.1.1 - - KATALON_VERSION=Linux_64-5.8.2 + - KATALON_VERSION=Linux_64-5.9.0 - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - SONAR_APP=sonar-scanner - SONAR_VERSION=3.2.0.1227-linux From 2232ae7ba12d3fbdb809a29f50b2b6395e7f8133 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 13 Dec 2018 08:58:42 -0800 Subject: [PATCH 020/226] fixed path issue with installing Katalon --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33548c927..1691f971b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -470,10 +470,10 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh - - wget https://github.com/katalon-studio/katalon-studio/releases/download/${KATALON_VERSION}/Katalon_Studio_${KATALON_VERSION}.tar.gz - - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz - - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} + - wget https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - ./ui-tests/runTests.sh @@ -488,7 +488,7 @@ env: - YAMLLINT_VERSION=1.8.1 - CXX=g++-4.8 - MONGODB=4.1.1 - - KATALON_VERSION=Linux_64-5.9.0 + - KATALON_VERSION=5.9.0 - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - SONAR_APP=sonar-scanner - SONAR_VERSION=3.2.0.1227-linux From d4c27dc0c6ca510141203ed74b8293c106036625 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 13 Dec 2018 15:04:34 -0800 Subject: [PATCH 021/226] printout the classpath file --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1691f971b..c9ef7bd32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -475,6 +475,8 @@ matrix: - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ + - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath + - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests - ./ui-tests/runTests.sh From 3b18060cb14f0e383053dc5cb90aa875547f8265 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 09:41:11 -0800 Subject: [PATCH 022/226] Add a test suite to debug the Katalon integration --- .../Script1544808549240.groovy | 21 ++++++ .../Test Cases/Requester/test_case_testing.tc | 8 +++ ui-tests/Test Suites/TestingTestSuite.groovy | 66 +++++++++++++++++++ ui-tests/Test Suites/TestingTestSuite.ts | 20 ++++++ ui-tests/runTestsTesting.sh | 3 + 5 files changed, 118 insertions(+) create mode 100644 ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy create mode 100644 ui-tests/Test Cases/Requester/test_case_testing.tc create mode 100644 ui-tests/Test Suites/TestingTestSuite.groovy create mode 100644 ui-tests/Test Suites/TestingTestSuite.ts create mode 100644 ui-tests/runTestsTesting.sh diff --git a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy new file mode 100644 index 000000000..20c39440a --- /dev/null +++ b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy @@ -0,0 +1,21 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +WebUI.openBrowser('') + +WebUI.delay(5) + +WebUI.closeBrowser() + diff --git a/ui-tests/Test Cases/Requester/test_case_testing.tc b/ui-tests/Test Cases/Requester/test_case_testing.tc new file mode 100644 index 000000000..a2198ee2c --- /dev/null +++ b/ui-tests/Test Cases/Requester/test_case_testing.tc @@ -0,0 +1,8 @@ + + + + test_case_testing + + + 2e88f452-f251-4bbb-b9a2-876eb3eecea1 + diff --git a/ui-tests/Test Suites/TestingTestSuite.groovy b/ui-tests/Test Suites/TestingTestSuite.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/ui-tests/Test Suites/TestingTestSuite.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/ui-tests/Test Suites/TestingTestSuite.ts b/ui-tests/Test Suites/TestingTestSuite.ts new file mode 100644 index 000000000..cfaf2f9db --- /dev/null +++ b/ui-tests/Test Suites/TestingTestSuite.ts @@ -0,0 +1,20 @@ + + + + TestingTestSuite + + false + 2018-12-14T09:32:19 + + 0 + 30 + true + false + 37beaa13-ec79-424e-aaa5-703cc753aa44 + + c0b18a0a-46ce-4d12-a377-bd30fe71c1b1 + false + true + Test Cases/Requester/test_case_testing + + diff --git a/ui-tests/runTestsTesting.sh b/ui-tests/runTestsTesting.sh new file mode 100644 index 000000000..76ff80ecc --- /dev/null +++ b/ui-tests/runTestsTesting.sh @@ -0,0 +1,3 @@ +echo "Starting tests" + +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/TestingTestSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From aa8b5ad66b4b3ee792f9cc56e3d840d547e9cd7e Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 09:58:52 -0800 Subject: [PATCH 023/226] update the travis file to call the new test testsuite --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9ef7bd32..269a37d6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -478,7 +478,7 @@ matrix: - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests - - ./ui-tests/runTests.sh + - ./ui-tests/runTestsTesting.sh env: global: From 833feb56dc269b5f1341b92416547360197d3d1c Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 10:19:50 -0800 Subject: [PATCH 024/226] added execution permission to the testing sh file --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 269a37d6c..8d2a1014b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -478,6 +478,7 @@ matrix: - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests + - chmod ugo+x runTestsTesting.sh - ./ui-tests/runTestsTesting.sh env: From 148b3e5ad5166cdc742ae30d22031495dba43d80 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 10:36:40 -0800 Subject: [PATCH 025/226] fixed path for chmod-ing the testing sh file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8d2a1014b..4ba107768 100644 --- a/.travis.yml +++ b/.travis.yml @@ -470,6 +470,7 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh + - chmod ugo+x runTestsTesting.sh - wget https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon @@ -478,7 +479,6 @@ matrix: - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests - - chmod ugo+x runTestsTesting.sh - ./ui-tests/runTestsTesting.sh env: From 3d1137ddd5fc9b8b24fb6533cf564a661fcc9748 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 11:09:19 -0800 Subject: [PATCH 026/226] added display setting to deal with X11 error when running test suite --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ba107768..ce512545c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -476,9 +476,8 @@ matrix: - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ - - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath - - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests + - Xvfb :0 >& /dev/null &DISPLAY=:0export DISPLAY - ./ui-tests/runTestsTesting.sh env: From 8d609bdccf5b1b9cb14ed2efb2833434aeb52534 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 11:33:32 -0800 Subject: [PATCH 027/226] travis tweaks --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce512545c..494814263 100644 --- a/.travis.yml +++ b/.travis.yml @@ -445,7 +445,6 @@ matrix: - NODE_ENV=test npm start & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - cd /home/travis/build/bcgov/OCWA/frontend @@ -471,13 +470,14 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh - chmod ugo+x runTestsTesting.sh - - wget https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - Xvfb :0 >& /dev/null &DISPLAY=:0export DISPLAY + - Xvfb :0 >& /dev/null &DISPLAY=:0 + - export DISPLAY - ./ui-tests/runTestsTesting.sh env: From 7973386ea6303dcea3e8d8c57314885e6afb9e6c Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 11:55:48 -0800 Subject: [PATCH 028/226] running katalon with sudo because chrome needs to bind a port apparently --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 494814263..0ac46cdec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -478,7 +478,7 @@ matrix: #RUN Integration Tests - Xvfb :0 >& /dev/null &DISPLAY=:0 - export DISPLAY - - ./ui-tests/runTestsTesting.sh + - sudo ./ui-tests/runTestsTesting.sh env: global: From 4f07278f12864b7828a6e607938697ce39705782 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 14:53:24 -0800 Subject: [PATCH 029/226] attempting to fix sudo environment vars --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ac46cdec..92f68ab4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -478,7 +478,7 @@ matrix: #RUN Integration Tests - Xvfb :0 >& /dev/null &DISPLAY=:0 - export DISPLAY - - sudo ./ui-tests/runTestsTesting.sh + - sudo -E PATH=$PATH ./ui-tests/runTestsTesting.sh env: global: From 04da83f299adb3f1aa1e1d4c3985194974d8155c Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 15:09:09 -0800 Subject: [PATCH 030/226] Added build stages --- .travis.yml | 91 +++++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92f68ab4c..26262fbde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: matrix: include: - name: "Forum Api" + stage: "APIs" language: node_js node_js: - "node" @@ -61,6 +62,7 @@ matrix: condition: $TRAVIS_BRANCH =~ ^master|develop$ - name: "Request Api" + stage: "APIs" language: node_js node_js: - "node" @@ -129,6 +131,7 @@ matrix: condition: $TRAVIS_BRANCH =~ ^master|develop$ - name: "Policy Api" + stage: "APIs" language: python python: - "3.6" @@ -170,6 +173,7 @@ matrix: condition: $TRAVIS_BRANCH =~ ^master|develop$ - name: "Validation Api" + stage: "APIs" language: python python: - "3.6" @@ -219,48 +223,8 @@ matrix: all_branches: true condition: $TRAVIS_BRANCH =~ ^master|develop$ - - name: "Front End" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - name: "Scan - Python" + stage: "Tests" python: - "3.6" cache: pip @@ -303,6 +267,7 @@ matrix: - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - name: "Scan - NodeJS" + stage: "Tests" language: node_js node_js: - "node" @@ -381,6 +346,7 @@ matrix: - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - name: "OCWA Master Helm Chart" + stage: "Tests" language: node_js node_js: - "node" @@ -397,6 +363,7 @@ matrix: - helm lint helm/ocwa - name: "Integration Tests" + stage: "Tests" language: node_js node_js: - "node" @@ -480,6 +447,48 @@ matrix: - export DISPLAY - sudo -E PATH=$PATH ./ui-tests/runTestsTesting.sh + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + env: global: - HELM_URL=https://storage.googleapis.com/kubernetes-helm From 3509453b7cd8843cc117ca67817228e7301cbf53 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 15:33:20 -0800 Subject: [PATCH 031/226] changed how xvfb is run and installed chrome --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26262fbde..4f0ed12d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -368,6 +368,7 @@ matrix: node_js: - "node" addons: + chrome: stable apt: sources: - ubuntu-toolchain-r-test @@ -443,9 +444,9 @@ matrix: - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - Xvfb :0 >& /dev/null &DISPLAY=:0 - - export DISPLAY - - sudo -E PATH=$PATH ./ui-tests/runTestsTesting.sh + - xvfb-run --server-args="-screen 0 1440x900x24" make test + - sleep 5 + - ./ui-tests/runTestsTesting.sh - name: "Front End" stage: "Frontend" From 182d217ba398bdddcd0ce733c3eeb00e5cb053b5 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 15:50:01 -0800 Subject: [PATCH 032/226] tweaked how xvfb is used --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f0ed12d4..9d648bd38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -444,9 +444,7 @@ matrix: - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" make test - - sleep 5 - - ./ui-tests/runTestsTesting.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh - name: "Front End" stage: "Frontend" From 073ecdd97d64ff6238c02d1bb31aba4ef951f2c3 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 16:52:10 -0800 Subject: [PATCH 033/226] testing testsuite seemed to work so switching back to cucumber test suite --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d648bd38..bda646eeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -444,7 +444,7 @@ matrix: - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh - name: "Front End" stage: "Frontend" From f670603a81010915c3fc8de4a8aaf37bd7259019 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 09:24:10 -0800 Subject: [PATCH 034/226] remove change directory command to test effect on the class path errors we've been seeing --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bda646eeb..6aab12b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -442,9 +442,10 @@ matrix: - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - - cd /home/travis/build/bcgov/OCWA/ + #- cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + #- xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - name: "Front End" stage: "Frontend" From 05112f5e2702bf5a88c93a7593085088e7740900 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 09:58:12 -0800 Subject: [PATCH 035/226] adding to the classpath to resolve missing class errors --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6aab12b60..9716edb38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -442,10 +442,11 @@ matrix: - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - #- cd /home/travis/build/bcgov/OCWA/ + - cd /home/travis/build/bcgov/OCWA/ + - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - #- xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh - - xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - name: "Front End" stage: "Frontend" From b4b731e936a743fce1d48c7b10f1c9f25301dfc2 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 17 Dec 2018 10:25:52 -0800 Subject: [PATCH 036/226] katalon needs openjdk 8 so install it --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9716edb38..d0c3dce48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -433,7 +433,10 @@ matrix: - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & - + + #Katalon requires OpenJDK 8 installed seperately + - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk + #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh From a6add4d4b43ce4297b7a3d8d02c312210c17aeff Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 11:01:23 -0800 Subject: [PATCH 037/226] try an expanded non-cucumber test --- .travis.yml | 2 +- .../Requester/test_case_testing/Script1544808549240.groovy | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0c3dce48..e166d9ab3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -448,7 +448,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - name: "Front End" diff --git a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy index 20c39440a..97fc4c379 100644 --- a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy +++ b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy @@ -13,9 +13,11 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -WebUI.openBrowser('') +WebUI.openBrowser('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') -WebUI.delay(5) +WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + +WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) WebUI.closeBrowser() From a5f30fe35b254ebce31591a9813d43ff56ff7bb5 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 11:29:27 -0800 Subject: [PATCH 038/226] fix testing url bug; leaner travis build for testing integration --- .travis.yml | 391 +----------------- .../Script1544808549240.groovy | 2 +- 2 files changed, 2 insertions(+), 391 deletions(-) diff --git a/.travis.yml b/.travis.yml index e166d9ab3..7bef02448 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,354 +13,6 @@ addons: matrix: include: - - name: "Forum Api" - stage: "APIs" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - before_script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - helm lint helm/forum-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Request Api" - stage: "APIs" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - npm install - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - helm lint helm/request-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Policy Api" - stage: "APIs" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - helm lint helm/policy-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Validation Api" - stage: "APIs" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - helm lint helm/validate-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Scan - Python" - stage: "Tests" - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1 -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - - - name: "Scan - NodeJS" - stage: "Tests" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - - cd /home/travis/build/bcgov/OCWA/frontend - - npm test - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - - name: "OCWA Master Helm Chart" - stage: "Tests" - language: node_js - node_js: - - "node" - cache: npm - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa - name: "Integration Tests" stage: "Tests" @@ -451,48 +103,7 @@ matrix: - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - - name: "Front End" - stage: "Frontend" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - + env: global: - HELM_URL=https://storage.googleapis.com/kubernetes-helm diff --git a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy index 97fc4c379..33d71f778 100644 --- a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy +++ b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy @@ -15,7 +15,7 @@ import internal.GlobalVariable as GlobalVariable WebUI.openBrowser('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') -WebUI.navigateToUrl(GlobalVariable.OCWA_URL) +//WebUI.navigateToUrl(GlobalVariable.OCWA_URL) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) From e2926cd4f9c7796f5d0d73f4fb2bf1d7d3fa235d Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 14:42:12 -0800 Subject: [PATCH 039/226] a minimal cucumber test --- .travis.yml | 2 +- .../groovy/Requester_step_def_ks.groovy | 80 +++++++++++++++---- 2 files changed, 64 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7bef02448..45733c8ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 70de81198..210e76e4d 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -62,27 +62,25 @@ class Requester_step_def_ks { WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) - WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + //WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + //WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } @Given("requester has started a request") def requester_starts_new_request() { - newRequestButtonObject = new TestObject("new-request-button") - newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + //newRequestButtonObject = new TestObject("new-request-button") + //newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - WebUI.waitForPageLoad(30) + //WebUI.waitForPageLoad(30) - WebUI.waitForElementClickable(newRequestButtonObject, 30) - //WebUI.sendKeys(Keys.Return) - WebUI.click(newRequestButtonObject) - - request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + //WebUI.waitForElementClickable(newRequestButtonObject, 30) + //WebUI.click(newRequestButtonObject) + //request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + //WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) } @Given("has not submitted the request") @@ -91,18 +89,66 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { + // selenium.click("id=request-form-save-files-button") + // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") + } + + @Given("the output files do not violate any blocking rules") + def output_files_do_not_violate_blocking_rules(){} + + @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") + def requester_affirms_output_is_safe() { + } + + @Given("requester has a submitted request") + def request_has_submitted_a_request(){ + requester_starts_new_request() + requester_adds_output_files() + requester_submits_request() } + @Given("the request has been claimed by an output checker") + def request_has_been_claimed_by_a_oc(){} + @When("the requester saves their request") def requester_saves_new_request() { - requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - WebUI.click(requestFormSaveCloseButtonObject) + //requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + //requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + //WebUI.click(requestFormSaveCloseButtonObject) + } + + @When("requester submits their request") + def requester_submits_request() { + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + } + + @When("requester writes and submits a new comment") + def requester_creates_a_new_comment(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Smcuk')) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + + //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) + + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') } @Then("the requester should be able to re-open the request and pick up where they left off") def confirm_draft_save_was_successful() { - WebUI.waitForPageLoad(0) - WebUI.verifyTextPresent(request_name, false) + //WebUI.waitForPageLoad(0) + //WebUI.verifyTextPresent(request_name, false) + } + + @Then("the requester's request is put in awaiting review") + def confirm_request_is_in_awaiting_review_state(){ + WebUI.verifyTextPresent("Awaiting review", false) + } + + @Then("the requester should not be able to submit the request") + def requester_is_not_able_to_submit_request(){ + WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) } } \ No newline at end of file From f4d1bacb1f94a3f2c74c2255817a6c93f07e7dad Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 14:57:43 -0800 Subject: [PATCH 040/226] explicitly provide the failure handling approach --- .../Script1544053608217.groovy | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy index f28816a4c..8c695da22 100644 --- a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy +++ b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy @@ -13,4 +13,22 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +//import org.junit.runner.RunWith +//import cucumber.api.CucumberOptions +//import cucumber.api.junit.Cucumber +//import com.kms.katalon.core.cucumber.keyword.CucumberRunnerResult + +//@RunWith(Cucumber.class) +//@CucumberOptions(features = "Include/features/requester", glue = "") +//public class MyCucumberRunner {} + +//cucumberRunnerClass c = new MyCucumberRunner() + +//CucumberRunnerResult c1 = CucumberKW.runWithCucumberRunner(MyCucumberRunner.class) + + +//CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature', FailureHandling.STOP_ON_FAILURE) +//CucumberRunnerResult c1 = CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +//CucumberKW.runFeatureFolder('Include/features/requester') +//println "Status" + c1.getStatus().toString() \ No newline at end of file From 2cd9f0780d8165cd99ebd42e36c174bcf1c00f57 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 15:58:31 -0800 Subject: [PATCH 041/226] simpliest cucumber test possible --- .../Include/scripts/groovy/Requester_step_def_ks.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 210e76e4d..5f5053221 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -57,10 +57,12 @@ class Requester_step_def_ks { @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') + WebUI.delay(5) + WebUI.closeBrowser() - WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') From cfc5ca1a94bf82e76112a4e73d1931fa1be9ca99 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 16:15:28 -0800 Subject: [PATCH 042/226] try using Cucumber Runner class instead of the runFeature call --- .../scripts/groovy/MyCucumberRunner.groovy | 26 +++++++++++++++++++ .../Script1544053608217.groovy | 14 +++------- 2 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy diff --git a/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy b/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy new file mode 100644 index 000000000..4ae4db5f1 --- /dev/null +++ b/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy @@ -0,0 +1,26 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.annotation.Keyword +import com.kms.katalon.core.checkpoint.Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.testcase.TestCase +import com.kms.katalon.core.testdata.TestData +import com.kms.katalon.core.testobject.TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI + +import internal.GlobalVariable + +import org.junit.runner.RunWith +import cucumber.api.CucumberOptions +import cucumber.api.junit.Cucumber +import com.kms.katalon.core.cucumber.keyword.CucumberRunnerResult + +@RunWith(Cucumber.class) +@CucumberOptions(features = "Include/features/requester/draft_requests.feature", glue = "") +public class MyCucumberRunner {} \ No newline at end of file diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy index 8c695da22..9abd4b88e 100644 --- a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy +++ b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy @@ -13,22 +13,16 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -//import org.junit.runner.RunWith -//import cucumber.api.CucumberOptions -//import cucumber.api.junit.Cucumber -//import com.kms.katalon.core.cucumber.keyword.CucumberRunnerResult - -//@RunWith(Cucumber.class) -//@CucumberOptions(features = "Include/features/requester", glue = "") -//public class MyCucumberRunner {} + //cucumberRunnerClass c = new MyCucumberRunner() -//CucumberRunnerResult c1 = CucumberKW.runWithCucumberRunner(MyCucumberRunner.class) +//CucumberRunnerResult c1 = +CucumberKW.runWithCucumberRunner(MyCucumberRunner.class) //CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') -CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature', FailureHandling.STOP_ON_FAILURE) +//CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature', FailureHandling.STOP_ON_FAILURE) //CucumberRunnerResult c1 = CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') //CucumberKW.runFeatureFolder('Include/features/requester') //println "Status" + c1.getStatus().toString() \ No newline at end of file From 7599b44a135b134862bd10108891e8c1065948fa Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 14:57:09 -0800 Subject: [PATCH 043/226] re-creating Katalon project in separate directory --- .travis.yml | 2 +- ui_tests/.gitignore | 8 + ui_tests/.project | 74 +++++++++ ui_tests/Include/config/log.properties | 6 + ...discussion_status_approved_request.feature | 7 + .../manual_output_checking_component.feature | 19 +++ .../team_sharing_component.feature | 22 +++ .../output_checker/adjudicate request.feature | 17 ++ .../output_checker/claim_request.feature | 14 ++ .../output_checker/undo_approval.feature | 9 + ...tered_requests_for_output_checkers.feature | 12 ++ ..._approved_output_files_outside_SRE.feature | 7 + .../requester/canceling_request.feature | 7 + .../requester/create_a_new_request.feature | 39 +++++ .../features/requester/draft_requests.feature | 16 ++ .../edit_previously_submitted_request.feature | 8 + .../features/requester/notifications.feature | 23 +++ .../requester/request_discussion.feature | 15 ++ ...edit_project_team_members_requests.feature | 15 ++ .../requester/see_requests_by_status.feature | 18 ++ .../requester/view_request_details.feature | 7 + .../groovy/Requester_step_def_ks.groovy | 156 ++++++++++++++++++ ui_tests/Libs/CustomKeywords.groovy | 5 + ui_tests/Libs/internal/GlobalVariable.groovy | 33 ++++ ui_tests/OCWA.prj | 28 ++++ ui_tests/Profiles/Travis.glbl | 12 ++ .../Script1545256102660.groovy | 17 ++ ui_tests/Test Cases/RunCucumberTests.tc | 8 + ui_tests/Test Suites/CucumberSuite.groovy | 66 ++++++++ ui_tests/Test Suites/CucumberSuite.ts | 20 +++ ui_tests/console.properties | 7 + ui_tests/runTests.sh | 3 + ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 0 ...com.kms.katalon.execution.webui.properties | 2 + ...s.katalon.integration.analytics.properties | 0 ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 38 files changed, 701 insertions(+), 1 deletion(-) create mode 100644 ui_tests/.gitignore create mode 100644 ui_tests/.project create mode 100644 ui_tests/Include/config/log.properties create mode 100644 ui_tests/Include/features/administator/export_discussion_status_approved_request.feature create mode 100644 ui_tests/Include/features/administator/manual_output_checking_component.feature create mode 100644 ui_tests/Include/features/administator/team_sharing_component.feature create mode 100644 ui_tests/Include/features/output_checker/adjudicate request.feature create mode 100644 ui_tests/Include/features/output_checker/claim_request.feature create mode 100644 ui_tests/Include/features/output_checker/undo_approval.feature create mode 100644 ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature create mode 100644 ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature create mode 100644 ui_tests/Include/features/requester/canceling_request.feature create mode 100644 ui_tests/Include/features/requester/create_a_new_request.feature create mode 100644 ui_tests/Include/features/requester/draft_requests.feature create mode 100644 ui_tests/Include/features/requester/edit_previously_submitted_request.feature create mode 100644 ui_tests/Include/features/requester/notifications.feature create mode 100644 ui_tests/Include/features/requester/request_discussion.feature create mode 100644 ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature create mode 100644 ui_tests/Include/features/requester/see_requests_by_status.feature create mode 100644 ui_tests/Include/features/requester/view_request_details.feature create mode 100644 ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy create mode 100644 ui_tests/Libs/CustomKeywords.groovy create mode 100644 ui_tests/Libs/internal/GlobalVariable.groovy create mode 100644 ui_tests/OCWA.prj create mode 100644 ui_tests/Profiles/Travis.glbl create mode 100644 ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy create mode 100644 ui_tests/Test Cases/RunCucumberTests.tc create mode 100644 ui_tests/Test Suites/CucumberSuite.groovy create mode 100644 ui_tests/Test Suites/CucumberSuite.ts create mode 100644 ui_tests/console.properties create mode 100644 ui_tests/runTests.sh create mode 100644 ui_tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.execution.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.execution.webui.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.integration.jira.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.integration.qtest.properties diff --git a/.travis.yml b/.travis.yml index 45733c8ab..7653b9162 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh diff --git a/ui_tests/.gitignore b/ui_tests/.gitignore new file mode 100644 index 000000000..0b12e47b0 --- /dev/null +++ b/ui_tests/.gitignore @@ -0,0 +1,8 @@ +# Katalon Studio +Reports/* +ReportFolder/* +Profiles/default.glbl +.classpath +.settings +/bin/ +Libs/TempTest*.groovy diff --git a/ui_tests/.project b/ui_tests/.project new file mode 100644 index 000000000..a3c48d6bb --- /dev/null +++ b/ui_tests/.project @@ -0,0 +1,74 @@ + + + OCWA.prj + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + + + 0 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 0 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 0 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 0 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545259433429 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545259433448 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + diff --git a/ui_tests/Include/config/log.properties b/ui_tests/Include/config/log.properties new file mode 100644 index 000000000..8142b1dc2 --- /dev/null +++ b/ui_tests/Include/config/log.properties @@ -0,0 +1,6 @@ +# This file is used to configure Katalon Studio execution log levels. + +# When you need to troubleshoot Katalon Studio issue +# logging.level.com.kms=TRACE + +# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature b/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature new file mode 100644 index 000000000..263130bd7 --- /dev/null +++ b/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature @@ -0,0 +1,7 @@ +Feature: export discussion and status log of a request +As an administrator I need the ability to export a discussion / status log to a pdf file upon request approval so that I have a file-based log of the conversation independent of the database + + Scenario: generate an export log of a newly approved request + Given a request has a status of "Review in Progress" + When an output checker approves the request + Then a pdf file should be generates that chronologically lists the discussion about the request as well as status changes \ No newline at end of file diff --git a/ui_tests/Include/features/administator/manual_output_checking_component.feature b/ui_tests/Include/features/administator/manual_output_checking_component.feature new file mode 100644 index 000000000..62c5aa0c6 --- /dev/null +++ b/ui_tests/Include/features/administator/manual_output_checking_component.feature @@ -0,0 +1,19 @@ +Feature: Enable / Disable manual output checker component +As an administrator I need the ability to disable the manual output checker components so that stakeholders that do not have a manual output checking step in their export process can still utilize the application + + Scenario: Manual output checking component turned off and passes all policy tests + Given the manual output checking component has been marked as disabled + And the request passes all policy tests + When a request is submitted + Then the request status should be "Approved" + + Scenario: Manual output checking component turned off and fails a policy test + Given the manual output checking component has been marked as disabled + And the request fails at least one policy test + When a request is submitted + Then the request status should be "Work in progress" + + Scenario: Manual output checking component is turned on + Given the manual output checking component has been marked as enabled + When a request is submitted + Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui_tests/Include/features/administator/team_sharing_component.feature b/ui_tests/Include/features/administator/team_sharing_component.feature new file mode 100644 index 000000000..328d41da8 --- /dev/null +++ b/ui_tests/Include/features/administator/team_sharing_component.feature @@ -0,0 +1,22 @@ +Feature: team sharing of requests +As an administrator I need the ability to enable / disable the ability for requesters to view / edit their team member's request on a per project basis so that multiple types of project sharing models can be accommodated + + Scenario outline: Team sharing enabled + Given team sharing has been marked as enabled + And requester A is logged in + And requester B on the same project exists + And requester B has a request + When requester A views team's requests + Then requester B's request status should be visible + Example: + | status | + | Draft | + | Awaiting review | + | Review in progress | + | Approved | + | Work in progress | + | Archived | + Scenario: Team sharing disabled + Given team sharing has been marked as disabled + When a request is submitted + Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/adjudicate request.feature b/ui_tests/Include/features/output_checker/adjudicate request.feature new file mode 100644 index 000000000..aa0da9e64 --- /dev/null +++ b/ui_tests/Include/features/output_checker/adjudicate request.feature @@ -0,0 +1,17 @@ +Feature: Adjudicate request +As an output checker I need the ability to change the status of a request to "Revisions required" so that I can allow the requester to tweak their request without having deny the request and forcing the requester to create a new request +As an output checker I need the ability to change the status of a request to "Approved" so that I can allow the requester to take their outputs out of the SRE + + Scenario: Request is worthy of approval + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as approved + Then the output checker should see the status of the request updated to "Approved" + And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request + + Scenario: Request is needs revisions + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as needs revisions + Then the output checker should see the status of the request updated to "Work in progress" + And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/claim_request.feature b/ui_tests/Include/features/output_checker/claim_request.feature new file mode 100644 index 000000000..371010dd3 --- /dev/null +++ b/ui_tests/Include/features/output_checker/claim_request.feature @@ -0,0 +1,14 @@ +Feature: Claim a request +As an output checker I need the ability to claim a request so that I can let my fellow output checker know that I'm going to be working on a particular request + +Scenario: Claim an unclaimed request +Given output checker has logged in +When output checker tries to claim an unclaimed request +Then the output checker should be able to see that they're now assigned the request + +Scenario: Claim a request already claimed by another output checker +Given output checker has logged in + And at least on other output checker exists + And the other output checker is assigned to a request +When output checker tries to claim the already assigned request +Then the output checker should be able to see that they're now assigned the request \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/undo_approval.feature b/ui_tests/Include/features/output_checker/undo_approval.feature new file mode 100644 index 000000000..d82687a8f --- /dev/null +++ b/ui_tests/Include/features/output_checker/undo_approval.feature @@ -0,0 +1,9 @@ +Feature: Undo request approval +As an output checker I need the ability to undo a request approval so that I can appropriately update requests to fix requests that were accidently approved or need to be made unavailable to an requester + +Scenario: Undo an approved request +Given output checker has logged in + And at least one approved request exists +When output checker submits an approved request to undo +Then the output checker should see that the request is now has a status of "Work in progress" +And the status of "Accepted" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature b/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature new file mode 100644 index 000000000..0300a9ed3 --- /dev/null +++ b/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature @@ -0,0 +1,12 @@ +Feature: See a list of all output checking requests +As an output checker I need the ability to see all requests so that I can quickly see what is in the queue + +Scenario Outline: View requests + Given output checker has logged in + When output checker selects a filter + Then the output checker should only see requests of type + Examples: + | filter | filter_condition | + | My requests | requests claimed by the output checker | + | Unassigned | requests not claimed by an output checker | + | All | all requests | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature b/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature new file mode 100644 index 000000000..f4951feff --- /dev/null +++ b/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature @@ -0,0 +1,7 @@ +Feature: Access approved output files outside of the secure environment +As an requester I want to be able to access approved output files outside of the secure environment so that I can share my results with others + Scenario: Access approved request outside of the SRE + Given requester has logged in (outside of SRE) + And requester has an approved request + When requester views their request's approved files + Then requester can copy their approved files to their local computer \ No newline at end of file diff --git a/ui_tests/Include/features/requester/canceling_request.feature b/ui_tests/Include/features/requester/canceling_request.feature new file mode 100644 index 000000000..a54c7dbbb --- /dev/null +++ b/ui_tests/Include/features/requester/canceling_request.feature @@ -0,0 +1,7 @@ +Feature: Canceling a request +As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed + Scenario: Cancel a request + Given requester has logged in + And requester has a request that is "Awaiting review" or "Review in progress" + When the requester cancels the request + Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui_tests/Include/features/requester/create_a_new_request.feature b/ui_tests/Include/features/requester/create_a_new_request.feature new file mode 100644 index 000000000..3b4fdc527 --- /dev/null +++ b/ui_tests/Include/features/requester/create_a_new_request.feature @@ -0,0 +1,39 @@ +Feature: create a new request + As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment + Background: + Given requester has logged in + And requester has started a request + And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge + Scenario: A valid request + Given the output files do not violate any blocking rules + When requester submits their request + Then the requester's request is put in awaiting review + Scenario: A request has no data + Given requester does not provide any data they wish to export + When requester submits their request + Then the requester should not be able to submit the request + + Scenario Outline: A request violates blocking rule + Given a request violates blocking rule: + When requester submits their request + Then requester should not be able to submit the request + And the requester should be informed that has been violated + + Examples: + | blocking_rule | + | A request that has a file that is too big | + | The summation of all export file sizes exceeds the request file size limit | + | An export file has a blocked file extension | + | A request has a file with a StudyID in it | + + Scenario Outline: A request violates warning rule + Given a request violates blocking rule: + When requester submits their request + Then requester should be able to submit the request + And the requester should be informed that has been violated + + Examples: + | warning_rule | + | A request that has a file that exceeds the file size warning threshold | + | The summation of all export file sizes exceeds the request file size warning threshold | + | An export file has a warning file extension | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature new file mode 100644 index 000000000..cbe142827 --- /dev/null +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -0,0 +1,16 @@ +Feature: Draft requests +As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once + Background: + Given requester has logged in + Scenario: Save a draft request (no files) + And requester has started a request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off + + Scenario: Save a draft request (with files) + And requester has started a request + And requester add output files to the request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off \ No newline at end of file diff --git a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature new file mode 100644 index 000000000..05dcde51b --- /dev/null +++ b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature @@ -0,0 +1,8 @@ +Feature: edit a previously submitted request +As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request + Scenario: Edit a request that has been reviewed by an output checker and needs revisions + Given requester has logged in + And requester the request is "Work in Progress" + When the requester views the request + Then the requester should be able to make changes to the request + And re-submit the request \ No newline at end of file diff --git a/ui_tests/Include/features/requester/notifications.feature b/ui_tests/Include/features/requester/notifications.feature new file mode 100644 index 000000000..e0c0df1fd --- /dev/null +++ b/ui_tests/Include/features/requester/notifications.feature @@ -0,0 +1,23 @@ +Feature: Notifications +As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action + + Scenario Outline: requester notifications + Given requester has a submitted request + When occurs + Then the requester should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | output checker makes a comment on the request | + | output checker approves the request | + | output checker requests revisions the request | + + Scenario Outline: output checker notifications + Given an output checker has currently claimed a request + When occurs + Then the output checker should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | requester makes a comment on the request | + | requester re-submits a request | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/request_discussion.feature b/ui_tests/Include/features/requester/request_discussion.feature new file mode 100644 index 000000000..f6aff55b7 --- /dev/null +++ b/ui_tests/Include/features/requester/request_discussion.feature @@ -0,0 +1,15 @@ +Feature: Discussion about a request + As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request + As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request + Scenario: requester adds a new comment about request + Given requester has logged in + And requester has a submitted request + And the request has been claimed by an output checker + When requester writes and submits a new comment + Then the requester should see their new comment displayed + And the output checker assigned to the request should be notified of the new comment + Scenario: Output checker adds a new comment about request + Given output checker has logged in + When output checker writes and submits a new comment + Then the output checker should see their new comment displayed + And the requester(s) associated to the request should be notified of the new comment \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature b/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature new file mode 100644 index 000000000..7e42638e3 --- /dev/null +++ b/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature @@ -0,0 +1,15 @@ +Feature: seeing / editing project team members requests +As an requester I need the ability to see / edit my team member's requests so that I can more easily collaborate with my fellow team members + Background: + Given requester has logged in + And the requester is a member of a project team + And another project team member has created a request + And the project has team sharing enabled + Scenario: View / edit a team member's request in a project that allows editing of team member's requests + Given the requester's project allows for editing of team member's requests + When the requester views their requests + Then the team member's request should be visible and editable + Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests + Given the requester's project does not allow for editing of team member's requests + When the requester views their requests + Then the team member's request should not be visible or editable \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_requests_by_status.feature b/ui_tests/Include/features/requester/see_requests_by_status.feature new file mode 100644 index 000000000..14c8c5bc5 --- /dev/null +++ b/ui_tests/Include/features/requester/see_requests_by_status.feature @@ -0,0 +1,18 @@ +Feature: See requester's requests by status +As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review + Scenario Outline: View requests + Given requester has logged in + And the requester has an request + And request was last updated within the last month + When requester views requests + Then requests should be displayed + But requests with updates older than a month should not be displayed + + Examples: + | status | filter | + | Approved | Approved | + | Revisions required | Draft | + | Awaiting review | Submitted | + | Review in progress | Submitted | + | Draft | Draft | + | Work in progress | Draft | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/view_request_details.feature b/ui_tests/Include/features/requester/view_request_details.feature new file mode 100644 index 000000000..d7ad2b06b --- /dev/null +++ b/ui_tests/Include/features/requester/view_request_details.feature @@ -0,0 +1,7 @@ +Feature: View request details +As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions + Scenario: View details of a request + Given requester has logged in + And the requester has submitted a request + When the requester views the request + Then the requester should see the complete record of the request (including export files, supporting files/text, discussion, and status changes) \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy new file mode 100644 index 000000000..5f5053221 --- /dev/null +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -0,0 +1,156 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.annotation.Keyword +import com.kms.katalon.core.checkpoint.Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.testcase.TestCase +import com.kms.katalon.core.testcase.TestCaseFactory +import com.kms.katalon.core.testdata.TestData +import com.kms.katalon.core.testdata.TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository +import com.kms.katalon.core.testobject.TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords + +import internal.GlobalVariable + +import MobileBuiltInKeywords as Mobile +import WSBuiltInKeywords as WS +import WebUiBuiltInKeywords as WebUI + +import org.openqa.selenium.WebElement +import org.openqa.selenium.WebDriver +import org.openqa.selenium.By + +import com.kms.katalon.core.mobile.keyword.internal.MobileDriverFactory +import com.kms.katalon.core.webui.driver.DriverFactory + +import com.kms.katalon.core.testobject.RequestObject +import com.kms.katalon.core.testobject.ResponseObject +import com.kms.katalon.core.testobject.ConditionType +import com.kms.katalon.core.testobject.TestObjectProperty + +import com.kms.katalon.core.mobile.helper.MobileElementCommonHelper +import com.kms.katalon.core.util.KeywordUtil + +import com.kms.katalon.core.webui.exception.WebElementNotFoundException + +import cucumber.api.java.en.And +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When + + +class Requester_step_def_ks { + String request_name = '' + TestObject newRequestButtonObject = null + TestObject requestFormSaveCloseButtonObject = null + + /** + * The step definitions below match with Katalon sample Gherkin steps + */ + @Given("requester has logged in") + def requester_login() { + WebUI.openBrowser('') + WebUI.delay(5) + WebUI.closeBrowser() + + //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) + + //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + + //WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + + //WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + } + + @Given("requester has started a request") + def requester_starts_new_request() { + + //newRequestButtonObject = new TestObject("new-request-button") + //newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + + //WebUI.waitForPageLoad(30) + + //WebUI.waitForElementClickable(newRequestButtonObject, 30) + //WebUI.click(newRequestButtonObject) + //request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + //WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + } + + @Given("has not submitted the request") + def requester_has_not_submitted_new_request() { + } + + @Given("requester add output files to the request") + def requester_adds_output_files() { + // selenium.click("id=request-form-save-files-button") + // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") + } + + @Given("the output files do not violate any blocking rules") + def output_files_do_not_violate_blocking_rules(){} + + @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") + def requester_affirms_output_is_safe() { + } + + @Given("requester has a submitted request") + def request_has_submitted_a_request(){ + requester_starts_new_request() + requester_adds_output_files() + requester_submits_request() + } + + @Given("the request has been claimed by an output checker") + def request_has_been_claimed_by_a_oc(){} + + @When("the requester saves their request") + def requester_saves_new_request() { + //requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + //requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + //WebUI.click(requestFormSaveCloseButtonObject) + } + + @When("requester submits their request") + def requester_submits_request() { + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + } + + @When("requester writes and submits a new comment") + def requester_creates_a_new_comment(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Smcuk')) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + + //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) + + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') + } + + @Then("the requester should be able to re-open the request and pick up where they left off") + def confirm_draft_save_was_successful() { + //WebUI.waitForPageLoad(0) + //WebUI.verifyTextPresent(request_name, false) + } + + @Then("the requester's request is put in awaiting review") + def confirm_request_is_in_awaiting_review_state(){ + WebUI.verifyTextPresent("Awaiting review", false) + } + + @Then("the requester should not be able to submit the request") + def requester_is_not_able_to_submit_request(){ + WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + } +} \ No newline at end of file diff --git a/ui_tests/Libs/CustomKeywords.groovy b/ui_tests/Libs/CustomKeywords.groovy new file mode 100644 index 000000000..c595a4f8a --- /dev/null +++ b/ui_tests/Libs/CustomKeywords.groovy @@ -0,0 +1,5 @@ + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ + diff --git a/ui_tests/Libs/internal/GlobalVariable.groovy b/ui_tests/Libs/internal/GlobalVariable.groovy new file mode 100644 index 000000000..073fd2170 --- /dev/null +++ b/ui_tests/Libs/internal/GlobalVariable.groovy @@ -0,0 +1,33 @@ +package internal + +import com.kms.katalon.core.configuration.RunConfiguration +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ +public class GlobalVariable { + + /** + *

+ */ + public static Object OCWA_URL + + + static { + def allVariables = [:] + allVariables.put('default', [:]) + allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) + + String profileName = RunConfiguration.getExecutionProfile() + + def selectedVariables = allVariables[profileName] + OCWA_URL = selectedVariables['OCWA_URL'] + + } +} diff --git a/ui_tests/OCWA.prj b/ui_tests/OCWA.prj new file mode 100644 index 000000000..b6f147e8e --- /dev/null +++ b/ui_tests/OCWA.prj @@ -0,0 +1,28 @@ + + + Katalon with Cucumber support + OCWA + + 3d119e91-3135-4c99-aab6-6022650ddbe1 + 5.9.0 + 0 + + + + Include/scripts/groovy + + + + + Include/scripts/groovy + + + Include/features + + + Include/config + + + + GENERIC + diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl new file mode 100644 index 000000000..feb3f8808 --- /dev/null +++ b/ui_tests/Profiles/Travis.glbl @@ -0,0 +1,12 @@ + + + + Travis + + false + + + 'http://localhost:8000' + OCWA_URL + + diff --git a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy new file mode 100644 index 000000000..3b1c2856f --- /dev/null +++ b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy @@ -0,0 +1,17 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') + diff --git a/ui_tests/Test Cases/RunCucumberTests.tc b/ui_tests/Test Cases/RunCucumberTests.tc new file mode 100644 index 000000000..de22fa419 --- /dev/null +++ b/ui_tests/Test Cases/RunCucumberTests.tc @@ -0,0 +1,8 @@ + + + + RunCucumberTests + + + 9ff0f7de-66e4-496b-8b61-802a9ed960fd + diff --git a/ui_tests/Test Suites/CucumberSuite.groovy b/ui_tests/Test Suites/CucumberSuite.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/ui_tests/Test Suites/CucumberSuite.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts new file mode 100644 index 000000000..d2f5f6ad0 --- /dev/null +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -0,0 +1,20 @@ + + + + CucumberSuite + + false + 2018-12-19T14:46:16 + + 0 + 30 + true + false + 4efd54cc-68dc-4a64-a8f1-7ae0c49473f5 + + f69ad29e-d701-467b-8299-76addc057f6a + false + true + Test Cases/RunCucumberTests + + diff --git a/ui_tests/console.properties b/ui_tests/console.properties new file mode 100644 index 000000000..417380976 --- /dev/null +++ b/ui_tests/console.properties @@ -0,0 +1,7 @@ +#Sat Sep 08 18:41:21 NZST 2018 +deviceId= +kobitonDeviceId= +qTestDestId= +qTestDestType= +remoteWebDriverType=Selenium +remoteWebDriverUrl= diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh new file mode 100644 index 000000000..62ac165cd --- /dev/null +++ b/ui_tests/runTests.sh @@ -0,0 +1,3 @@ +echo "Starting tests" + +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuites" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui_tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/ui_tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/settings/internal/com.kms.katalon.execution.properties b/ui_tests/settings/internal/com.kms.katalon.execution.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties new file mode 100644 index 000000000..c09ce9715 --- /dev/null +++ b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties @@ -0,0 +1,2 @@ +#Sat Sep 08 18:41:20 NZST 2018 +execution.default.selectingCapturedObjectSelectorMethod="XPATH" diff --git a/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/settings/internal/com.kms.katalon.integration.jira.properties b/ui_tests/settings/internal/com.kms.katalon.integration.jira.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/settings/internal/com.kms.katalon.integration.qtest.properties b/ui_tests/settings/internal/com.kms.katalon.integration.qtest.properties new file mode 100644 index 000000000..e69de29bb From 9a2a30cc5d22dc68f07b8d7cb96b59a383ab8701 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 15:09:52 -0800 Subject: [PATCH 044/226] fixed path issue --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7653b9162..f00d2fc3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,15 +90,15 @@ matrix: - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui-tests + - cd /home/travis/build/bcgov/OCWA/ui_tests - chmod ugo+x runTests.sh - chmod ugo+x runTestsTesting.sh - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui_tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ - - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui_tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From 1ddd7c22a635951863013f429160af45eb1101b7 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 15:23:49 -0800 Subject: [PATCH 045/226] fixed typo in shell file --- ui_tests/runTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh index 62ac165cd..79d2780ee 100644 --- a/ui_tests/runTests.sh +++ b/ui_tests/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuites" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From 2851dbd43be0e61b6fc61691061bc571752241a0 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 15:41:21 -0800 Subject: [PATCH 046/226] try installing Katalon a directory up --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f00d2fc3d..965bcbc29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,12 +93,13 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ui_tests - chmod ugo+x runTests.sh - chmod ugo+x runTestsTesting.sh + #added line to install Katalon a directory up + - cd /home/travis/build/bcgov/OCWA - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui_tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - - cd /home/travis/build/bcgov/OCWA/ - - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui_tests/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/OCWA/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From ffd45d9f6092fccec659adb70da07661d6074b73 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 16:13:48 -0800 Subject: [PATCH 047/226] add additional cucumber test suite --- ui_tests/Include/features/Login.feature | 32 ++++++ .../com/ea/steps/CucumberEARunner.groovy | 14 +++ .../groovy/com/ea/steps/LoginSteps.groovy | 103 ++++++++++++++++++ .../Script1536389635449.groovy | 18 +++ ui_tests/Test Cases/ExecuteAutomation_TC1.tc | 8 ++ ui_tests/Test Suites/TestSuite1.groovy | 66 +++++++++++ ui_tests/Test Suites/TestSuite1.ts | 20 ++++ ui_tests/runTests.sh | 2 +- 8 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 ui_tests/Include/features/Login.feature create mode 100644 ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy create mode 100644 ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy create mode 100644 ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy create mode 100644 ui_tests/Test Cases/ExecuteAutomation_TC1.tc create mode 100644 ui_tests/Test Suites/TestSuite1.groovy create mode 100644 ui_tests/Test Suites/TestSuite1.ts diff --git a/ui_tests/Include/features/Login.feature b/ui_tests/Include/features/Login.feature new file mode 100644 index 000000000..9a29cd767 --- /dev/null +++ b/ui_tests/Include/features/Login.feature @@ -0,0 +1,32 @@ +#Author: your.email@your.domain.com +#Keywords Summary : +#Feature: List of scenarios. +#Scenario: Business rule through list of steps with arguments. +#Given: Some precondition step +#When: Some key actions +#Then: To observe outcomes or validation +#And,But: To enumerate more Given,When,Then steps +#Scenario Outline: List of steps for data-driven as an Examples and +#Examples: Container for s table +#Background: List of steps run before each of the scenarios +#""" (Doc Strings) +#| (Data Tables) +#@ (Tags/Labels):To group Scenarios +#<> (placeholder) +#"" +## (Comments) +#Sample Feature Definition Template + + +@loginFeature +Feature: Login + Test the login functionality of the application + + @smoke + Scenario: Test the login functionality of EA application + Given I navigate to the login page + And I enter the following for Login + | username | password | + | admin | adminpassword | + And I click the login button + Then I should see the home page \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy new file mode 100644 index 000000000..bbd0ed1e9 --- /dev/null +++ b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy @@ -0,0 +1,14 @@ +package com.ea.steps + + +import org.junit.runner.RunWith; + +import cucumber.api.CucumberOptions; +import cucumber.api.junit.Cucumber; + + + +@RunWith(Cucumber.class) +@CucumberOptions(features="Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) +public class CucumberEARunner { +} diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy new file mode 100644 index 000000000..efe3bfe0d --- /dev/null +++ b/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy @@ -0,0 +1,103 @@ +package com.ea.steps +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI + +import cucumber.api.TypeRegistry; +import cucumber.api.TypeRegistryConfigurer; +import cucumber.api.java.en.And +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When +import io.cucumber.datatable.DataTableType; +import io.cucumber.datatable.TableEntryTransformer; + + +/* + * Author: Karthik KK + * Company: ExecuteAutomation + * Type: StepDefinition + * Step : LoginStep + */ +class LoginSteps { + @Given("I navigate to the login page") + def I_navigate_to_the_login_page() { + WebUI.openBrowser('') + WebUI.navigateToUrl('http://www.executeautomation.com/demosite/Login.html') + } + + + //Obsolete step + @When('I enter the username as "(.*) and password as "(.*)"') + def I_enter_username_password(String userName, String password) { + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), userName) + + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), password) + } + + @And("I enter the following for Login") + def I_enter_the_following_for_login(List table){ + // Way 1 - To get data from DataTable Type + // List> data = table.asMaps(String.class, String.class); + + // Way 2 - To get work with custom types using Lust + // //Create an ArrayList + // List users = new ArrayList(); + // //Store all the users + // users = table.asList(User.class); + + + //Iterate through the values + for (User user: table){ + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), user.username) + + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), user.password) + } + } + + + @Then("I click the login button") + def I_Click_login_button() { + WebUI.click(findTestObject('Object Repository/Page_Execute Automation/input_Login_Login')) + } + + @Then("I should see the home page") + def I_Should_see_the_home_page(){ + + //Assertions has been done ! + } +} + + +//Custom class responsible to get UserName and Password from table steps +class User { + public String username; + public String password; + + public User(String userName, String passWord) { + username= userName; + password = passWord; + } +} + + +//Custom Transformer to convert the custom User type +class Configurer implements TypeRegistryConfigurer { + + @Override + public void configureTypeRegistry(TypeRegistry registry) { + + registry.defineDataTableType(new DataTableType(User.class, new TableEntryTransformer() { + @Override + public User transform(Map entry) { + return new User(entry.get("username"),entry.get("password")); + } + })); + } + + @Override + public Locale locale() { + return Locale.ENGLISH; + } + +} diff --git a/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy b/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy new file mode 100644 index 000000000..f297771da --- /dev/null +++ b/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy @@ -0,0 +1,18 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.ea.steps.CucumberEARunner +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +CucumberKW.runWithCucumberRunner(CucumberEARunner.class) diff --git a/ui_tests/Test Cases/ExecuteAutomation_TC1.tc b/ui_tests/Test Cases/ExecuteAutomation_TC1.tc new file mode 100644 index 000000000..fce57605d --- /dev/null +++ b/ui_tests/Test Cases/ExecuteAutomation_TC1.tc @@ -0,0 +1,8 @@ + + + + ExecuteAutomation_TC1 + + + 9ccc1ff2-1a70-4f4b-ad95-dad93a1390b8 + diff --git a/ui_tests/Test Suites/TestSuite1.groovy b/ui_tests/Test Suites/TestSuite1.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/ui_tests/Test Suites/TestSuite1.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/ui_tests/Test Suites/TestSuite1.ts b/ui_tests/Test Suites/TestSuite1.ts new file mode 100644 index 000000000..a15c181f7 --- /dev/null +++ b/ui_tests/Test Suites/TestSuite1.ts @@ -0,0 +1,20 @@ + + + + TestSuite1 + + false + 2018-12-19T13:44:58 + + 0 + 30 + true + false + e8a1ffd6-0ef9-4ac4-9cad-c711a822a0a5 + + 2521c26f-59d1-446f-9fbe-59281ccceb99 + false + true + Test Cases/ExecuteAutomation_TC1 + + diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh index 79d2780ee..97a5b840f 100644 --- a/ui_tests/runTests.sh +++ b/ui_tests/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From 2411fb5f7967f4efd81924ec33a263d764e1d6c1 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 16:50:34 -0800 Subject: [PATCH 048/226] revise cucumber runner path --- .../Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy index bbd0ed1e9..1e1f8b79e 100644 --- a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy +++ b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy @@ -9,6 +9,6 @@ import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features="Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) +@CucumberOptions(features="ui_tests/Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) public class CucumberEARunner { } From 8a8513ced568b35731ea1370c5f2f357db4f0c8f Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 09:56:29 -0800 Subject: [PATCH 049/226] move Katalon install location up a dir --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 965bcbc29..14b7f7f6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,13 +94,14 @@ matrix: - chmod ugo+x runTests.sh - chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up - - cd /home/travis/build/bcgov/OCWA + - cd /home/travis/build/bcgov - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/OCWA/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests + - cd /home/travis/build/bcgov/OCWA - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From 26e697fcbb077c1094c39613dec834d12da6329f Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 10:30:40 -0800 Subject: [PATCH 050/226] classpath addition --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14b7f7f6a..26fe8e687 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,8 @@ matrix: - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins + - echo $CLASSPATH #RUN Integration Tests - cd /home/travis/build/bcgov/OCWA - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh From 4cc510cd2ef0581ec9fc15bd9c16820ae5baf04d Mon Sep 17 00:00:00 2001 From: Paul Ripley Date: Thu, 20 Dec 2018 10:52:36 -0800 Subject: [PATCH 051/226] added git attribute file --- .gitattributes | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..b6cff8ec5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,14 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.c text +*.h text + +# Declare files that will always have CRLF line endings on checkout. +*.sln text eol=lf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary \ No newline at end of file From da1669a47998955cb174608766712757f1d281a3 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 10:55:02 -0800 Subject: [PATCH 052/226] update to Travis --- .travis.yml | 263 ++++++++++++++++++++++++++-------------------------- 1 file changed, 132 insertions(+), 131 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26fe8e687..d0d8e18c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,131 +1,132 @@ -dist: trusty -sudo: required -language: python - -services: -- docker - -addons: - sonarcloud: - organization: "ajc_bcgov" - token: - secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= - -matrix: - include: - - - name: "Integration Tests" - stage: "Tests" - language: node_js - node_js: - - "node" - addons: - chrome: stable - apt: - sources: - - ubuntu-toolchain-r-test - - python3-pip - packages: - - g++-4.8 - - python3-pip - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - - NODE_ENV=test npm start & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - - cd /home/travis/build/bcgov/OCWA/frontend - - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - #Katalon requires OpenJDK 8 installed seperately - - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk - - #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui_tests - - chmod ugo+x runTests.sh - - chmod ugo+x runTestsTesting.sh - #added line to install Katalon a directory up - - cd /home/travis/build/bcgov - - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins - - echo $CLASSPATH - #RUN Integration Tests - - cd /home/travis/build/bcgov/OCWA - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh - #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - - -env: - global: - - HELM_URL=https://storage.googleapis.com/kubernetes-helm - - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz - - TARGET_BR=gh-pages - - REPO_DIR=/home/travis/build/kubenow/helm-charts - - GH_URL=https://kubenow.github.io/helm-charts - - YAMLLINT_VERSION=1.8.1 - - CXX=g++-4.8 - - MONGODB=4.1.1 - - KATALON_VERSION=5.9.0 - - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - - SONAR_APP=sonar-scanner - - SONAR_VERSION=3.2.0.1227-linux - - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= - - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= - #SONAR_TOKEN - - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= - #QUAYIO_USERNAME - - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= - #QUAYIO_PASSWORD - - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= +dist: trusty +sudo: required +language: python + +services: +- docker + +addons: + sonarcloud: + organization: "ajc_bcgov" + token: + secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= + +matrix: + include: + + - name: "Integration Tests" + stage: "Tests" + language: node_js + node_js: + - "node" + addons: + chrome: stable + apt: + sources: + - ubuntu-toolchain-r-test + - python3-pip + packages: + - g++-4.8 + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + - cd /home/travis/build/bcgov/OCWA/frontend + + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + + #Katalon requires OpenJDK 8 installed seperately + - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk + + #Install Katalon Studios + - cd /home/travis/build/bcgov/OCWA/ui_tests + - chmod ugo+x runTests.sh + - chmod ugo+x runTestsTesting.sh + #added line to install Katalon a directory up + - cd /home/travis/build/bcgov + - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins + - echo $CLASSPATH + #RUN Integration Tests + - cd /home/travis/build/bcgov/OCWA + - cat ./ui_tests/console.properties + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh + #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh + + +env: + global: + - HELM_URL=https://storage.googleapis.com/kubernetes-helm + - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz + - TARGET_BR=gh-pages + - REPO_DIR=/home/travis/build/kubenow/helm-charts + - GH_URL=https://kubenow.github.io/helm-charts + - YAMLLINT_VERSION=1.8.1 + - CXX=g++-4.8 + - MONGODB=4.1.1 + - KATALON_VERSION=5.9.0 + - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ + - SONAR_APP=sonar-scanner + - SONAR_VERSION=3.2.0.1227-linux + - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= + - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= + #SONAR_TOKEN + - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= + #QUAYIO_USERNAME + - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= + #QUAYIO_PASSWORD + - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= From 455b7568cf606f52cd4c6ac76e16f8e3d7905537 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 11:46:38 -0800 Subject: [PATCH 053/226] changed Katalon directory permissions --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d0d8e18c4..2ac0c1298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,6 +98,7 @@ matrix: - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins - echo $CLASSPATH From a79c7a5565d8f607c9d3ea46b5283cfb7f6fe888 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 12:45:51 -0800 Subject: [PATCH 054/226] printout the classpath --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2ac0c1298..efc99a02a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,6 +106,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA - cat ./ui_tests/console.properties - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh + - cat ./ui_tests/.classpath #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From 9f9d41e324d0dd302711f58d4e49d6a25d6729e6 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 13:27:27 -0800 Subject: [PATCH 055/226] try runfeaturefile --- ui_tests/runTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh index 97a5b840f..79d2780ee 100644 --- a/ui_tests/runTests.sh +++ b/ui_tests/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From 4dbfdb3cf9dadbb4372aebfecd74892bf92df39c Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 13:57:45 -0800 Subject: [PATCH 056/226] try out BDD example project in Travis --- .travis.yml | 10 +- KatalonCucumberBDD/.gitignore | 7 ++ KatalonCucumberBDD/.project | 74 +++++++++++++ .../Include/config/log.properties | 6 + .../Include/features/Login.feature | 32 ++++++ .../com/ea/steps/CucumberEARunner.groovy | 14 +++ .../groovy/com/ea/steps/LoginSteps.groovy | 103 ++++++++++++++++++ KatalonCucumberBDD/KatalonCucumber.prj | 28 +++++ KatalonCucumberBDD/Libs/CustomKeywords.groovy | 5 + .../Libs/internal/GlobalVariable.groovy | 26 +++++ .../input_EnglishHindi_Save.rs | 80 ++++++++++++++ .../input_Initial_Initial.rs | 86 +++++++++++++++ .../input_Login_Login.rs | 86 +++++++++++++++ .../input_Login_Password.rs | 86 +++++++++++++++ .../input_Login_UserName.rs | 86 +++++++++++++++ .../input__FirstName.rs | 86 +++++++++++++++ KatalonCucumberBDD/Profiles/default.glbl | 7 ++ KatalonCucumberBDD/README.md | 9 ++ .../Script1536389635449.groovy | 18 +++ .../Test Cases/ExecuteAutomation_TC1.tc | 8 ++ .../Test Suites/TestSuite1.groovy | 66 +++++++++++ KatalonCucumberBDD/Test Suites/TestSuite1.ts | 20 ++++ KatalonCucumberBDD/console.properties | 7 ++ KatalonCucumberBDD/runTests.bat | 3 + KatalonCucumberBDD/runTests.sh | 3 + ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 0 ...com.kms.katalon.execution.webui.properties | 2 + ...s.katalon.integration.analytics.properties | 0 ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 .../.syncinfo.snap | Bin 0 -> 32 bytes 32 files changed, 953 insertions(+), 5 deletions(-) create mode 100644 KatalonCucumberBDD/.gitignore create mode 100644 KatalonCucumberBDD/.project create mode 100644 KatalonCucumberBDD/Include/config/log.properties create mode 100644 KatalonCucumberBDD/Include/features/Login.feature create mode 100644 KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy create mode 100644 KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy create mode 100644 KatalonCucumberBDD/KatalonCucumber.prj create mode 100644 KatalonCucumberBDD/Libs/CustomKeywords.groovy create mode 100644 KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs create mode 100644 KatalonCucumberBDD/Profiles/default.glbl create mode 100644 KatalonCucumberBDD/README.md create mode 100644 KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy create mode 100644 KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc create mode 100644 KatalonCucumberBDD/Test Suites/TestSuite1.groovy create mode 100644 KatalonCucumberBDD/Test Suites/TestSuite1.ts create mode 100644 KatalonCucumberBDD/console.properties create mode 100644 KatalonCucumberBDD/runTests.bat create mode 100644 KatalonCucumberBDD/runTests.sh create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties create mode 100644 config/.metadata/.plugins/org.eclipse.core.resources/.projects/C%%Users%PaulR%Documents%OCWA%OCWA%KatalonCucumberBDD%KatalonCucumber.prj/.syncinfo.snap diff --git a/.travis.yml b/.travis.yml index efc99a02a..3ce8e4d0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,9 +90,9 @@ matrix: - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui_tests + - cd /home/travis/build/bcgov/OCWA/KatalonCucumber - chmod ugo+x runTests.sh - - chmod ugo+x runTestsTesting.sh + #- chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up - cd /home/travis/build/bcgov - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz @@ -104,9 +104,9 @@ matrix: - echo $CLASSPATH #RUN Integration Tests - cd /home/travis/build/bcgov/OCWA - - cat ./ui_tests/console.properties - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh - - cat ./ui_tests/.classpath + - cat ./KatalonCucumber/console.properties + - xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumber/runTests.sh + - cat ./KatalonCucumber/.classpath #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh diff --git a/KatalonCucumberBDD/.gitignore b/KatalonCucumberBDD/.gitignore new file mode 100644 index 000000000..b7c73c1f6 --- /dev/null +++ b/KatalonCucumberBDD/.gitignore @@ -0,0 +1,7 @@ +# Katalon Studio +Reports/* +ReportFolder/* +.classpath +.settings +/bin/ +Libs/TempTest*.groovy diff --git a/KatalonCucumberBDD/.project b/KatalonCucumberBDD/.project new file mode 100644 index 000000000..fa1b5267e --- /dev/null +++ b/KatalonCucumberBDD/.project @@ -0,0 +1,74 @@ + + + C%%Users%PaulR%Documents%KatalonCucumberBDD%KatalonCucumber.prj + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + + + 1545169329215 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545169329228 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545342090617 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545342090664 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545342237726 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545342237742 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + diff --git a/KatalonCucumberBDD/Include/config/log.properties b/KatalonCucumberBDD/Include/config/log.properties new file mode 100644 index 000000000..8142b1dc2 --- /dev/null +++ b/KatalonCucumberBDD/Include/config/log.properties @@ -0,0 +1,6 @@ +# This file is used to configure Katalon Studio execution log levels. + +# When you need to troubleshoot Katalon Studio issue +# logging.level.com.kms=TRACE + +# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/KatalonCucumberBDD/Include/features/Login.feature b/KatalonCucumberBDD/Include/features/Login.feature new file mode 100644 index 000000000..1b8ab732f --- /dev/null +++ b/KatalonCucumberBDD/Include/features/Login.feature @@ -0,0 +1,32 @@ +#Author: your.email@your.domain.com +#Keywords Summary : +#Feature: List of scenarios. +#Scenario: Business rule through list of steps with arguments. +#Given: Some precondition step +#When: Some key actions +#Then: To observe outcomes or validation +#And,But: To enumerate more Given,When,Then steps +#Scenario Outline: List of steps for data-driven as an Examples and +#Examples: Container for s table +#Background: List of steps run before each of the scenarios +#""" (Doc Strings) +#| (Data Tables) +#@ (Tags/Labels):To group Scenarios +#<> (placeholder) +#"" +## (Comments) +#Sample Feature Definition Template + + +@loginFeature +Feature: Login + Test the login functionality of the application + + @smoke + Scenario: Test the login functionality of EA application + Given I navigate to the login page + And I enter the following for Login + | username | password | + | admin | adminpassword | + And I click the login button + Then I should see the home page \ No newline at end of file diff --git a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy new file mode 100644 index 000000000..a720b7a3e --- /dev/null +++ b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy @@ -0,0 +1,14 @@ +package com.ea.steps + + +import org.junit.runner.RunWith; + +import cucumber.api.CucumberOptions; +import cucumber.api.junit.Cucumber; + + + +@RunWith(Cucumber.class) +@CucumberOptions(features="KatalonCucumberBDD/Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) +public class CucumberEARunner { +} diff --git a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy new file mode 100644 index 000000000..a0de37450 --- /dev/null +++ b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy @@ -0,0 +1,103 @@ +package com.ea.steps +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI + +import cucumber.api.TypeRegistry; +import cucumber.api.TypeRegistryConfigurer; +import cucumber.api.java.en.And +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When +import io.cucumber.datatable.DataTableType; +import io.cucumber.datatable.TableEntryTransformer; + + +/* + * Author: Karthik KK + * Company: ExecuteAutomation + * Type: StepDefinition + * Step : LoginStep + */ +class LoginSteps { + @Given("I navigate to the login page") + def I_navigate_to_the_login_page() { + WebUI.openBrowser('') + WebUI.navigateToUrl('http://www.executeautomation.com/demosite/Login.html') + } + + + //Obsolete step + @When('I enter the username as "(.*) and password as "(.*)"') + def I_enter_username_password(String userName, String password) { + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), userName) + + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), password) + } + + @And("I enter the following for Login") + def I_enter_the_following_for_login(List table){ + // Way 1 - To get data from DataTable Type + // List> data = table.asMaps(String.class, String.class); + + // Way 2 - To get work with custom types using Lust + // //Create an ArrayList + // List users = new ArrayList(); + // //Store all the users + // users = table.asList(User.class); + + + //Iterate through the values + for (User user: table){ + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), user.username) + + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), user.password) + } + } + + + @Then("I click the login button") + def I_Click_login_button() { + WebUI.click(findTestObject('Object Repository/Page_Execute Automation/input_Login_Login')) + } + + @Then("I should see the home page") + def I_Should_see_the_home_page(){ + + //Assertions has been done ! + } +} + + +//Custom class responsible to get UserName and Password from table steps +class User { + public String username; + public String password; + + public User(String userName, String passWord) { + username= userName; + password = passWord; + } +} + + +//Custom Transformer to convert the custom User type +class Configurer implements TypeRegistryConfigurer { + + @Override + public void configureTypeRegistry(TypeRegistry registry) { + + registry.defineDataTableType(new DataTableType(User.class, new TableEntryTransformer() { + @Override + public User transform(Map entry) { + return new User(entry.get("username"),entry.get("password")); + } + })); + } + + @Override + public Locale locale() { + return Locale.ENGLISH; + } + +} diff --git a/KatalonCucumberBDD/KatalonCucumber.prj b/KatalonCucumberBDD/KatalonCucumber.prj new file mode 100644 index 000000000..c48d3b350 --- /dev/null +++ b/KatalonCucumberBDD/KatalonCucumber.prj @@ -0,0 +1,28 @@ + + + Katalon with Cucumber support + KatalonCucumber + + 3d119e91-3135-4c99-aab6-6022650ddbe1 + 5.9.0 + 0 + + + + Include/scripts/groovy + + + + + Include/scripts/groovy + + + Include/features + + + Include/config + + + + GENERIC + diff --git a/KatalonCucumberBDD/Libs/CustomKeywords.groovy b/KatalonCucumberBDD/Libs/CustomKeywords.groovy new file mode 100644 index 000000000..c595a4f8a --- /dev/null +++ b/KatalonCucumberBDD/Libs/CustomKeywords.groovy @@ -0,0 +1,5 @@ + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ + diff --git a/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy b/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy new file mode 100644 index 000000000..0f60ebe2b --- /dev/null +++ b/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy @@ -0,0 +1,26 @@ +package internal + +import com.kms.katalon.core.configuration.RunConfiguration +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ +public class GlobalVariable { + + + static { + def allVariables = [:] + allVariables.put('default', [:]) + + String profileName = RunConfiguration.getExecutionProfile() + + def selectedVariables = allVariables[profileName] + + } +} diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs new file mode 100644 index 000000000..ec456a8cc --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs @@ -0,0 +1,80 @@ + + + + input_EnglishHindi_Save + + ecd9d263-24cb-4f55-86e0-5f8b37295ddd + + + XPATH + //input[@name='Save'] + + + XPATH + false + + true + equals + tag + Main + input + + + true + equals + name + Main + Save + + + true + equals + type + Main + button + + + false + equals + value + Main + Save + + + false + equals + xpath + Main + id("details")/table[1]/tbody[1]/tr[7]/td[1]/input[1] + + + true + equals + xpath:attributes + //input[@name='Save'] + + + false + equals + xpath:idRelative + //form[@id='details']/table/tbody/tr[7]/td/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Languages Known'])[1]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Click For'])[1]/preceding::input[1] + + + false + equals + xpath:position + //tr[7]/td/input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs new file mode 100644 index 000000000..4c0d2089d --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs @@ -0,0 +1,86 @@ + + + + input_Initial_Initial + + 4147d414-db74-43aa-93cf-b83588a4a5ac + + + XPATH + //input[@id='Initial'] + + + XPATH + false + + true + equals + tag + Main + input + + + true + equals + id + Main + Initial + + + true + equals + name + Main + Initial + + + true + equals + type + Main + text + + + false + equals + xpath + Main + id("Initial") + + + true + equals + xpath:attributes + //input[@id='Initial'] + + + false + equals + xpath:idRelative + //form[@id='details']/table/tbody/tr[2]/td[2]/span/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Initial'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[2]/preceding::input[1] + + + false + equals + xpath:position + //input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs new file mode 100644 index 000000000..1f21fdbfa --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs @@ -0,0 +1,86 @@ + + + + input_Login_Login + + f6f35be9-c6a2-4e27-91ea-56d2eb891b0f + + + XPATH + //input[@name='Login'] + + + XPATH + false + + true + equals + tag + Main + input + + + true + equals + name + Main + Login + + + true + equals + type + Main + submit + + + false + equals + value + Main + Login + + + false + equals + xpath + Main + id("userName")/p[3]/input[1] + + + true + equals + xpath:attributes + //input[@name='Login'] + + + false + equals + xpath:idRelative + //form[@id='userName']/p[3]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[3]/input[1]')])[1]/preceding::input[1] + + + false + equals + xpath:position + //p[3]/input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs new file mode 100644 index 000000000..55092ed9f --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs @@ -0,0 +1,86 @@ + + + + input_Login_Password + + 8b324a72-4913-4c7a-b70a-82f50bd94358 + + + XPATH + //input[@name='Password'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + maxlength + Main + 10 + + + true + equals + name + Main + Password + + + true + equals + type + Main + text + + + false + equals + xpath + Main + id("userName")/p[2]/input[1] + + + true + equals + xpath:attributes + //input[@name='Password'] + + + false + equals + xpath:idRelative + //form[@id='userName']/p[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[1]/input[1]')])[1]/preceding::input[2] + + + false + equals + xpath:position + //p[2]/input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs new file mode 100644 index 000000000..a0645ef4b --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs @@ -0,0 +1,86 @@ + + + + input_Login_UserName + + ae864cbc-fb6c-426f-a41c-4fa206b8b905 + + + XPATH + //input[@name='UserName'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + maxlength + Main + 10 + + + true + equals + name + Main + UserName + + + true + equals + type + Main + text + + + false + equals + xpath + Main + id("userName")/p[1]/input[1] + + + true + equals + xpath:attributes + //input[@name='UserName'] + + + false + equals + xpath:idRelative + //form[@id='userName']/p/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[1]/input[1]')])[1]/preceding::input[3] + + + false + equals + xpath:position + //input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs new file mode 100644 index 000000000..5bb0a455f --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs @@ -0,0 +1,86 @@ + + + + input__FirstName + + 96539eeb-add3-4a43-8e44-b9dcb7056248 + + + XPATH + //input[@id='FirstName'] + + + XPATH + false + + true + equals + tag + Main + input + + + true + equals + id + Main + FirstName + + + true + equals + name + Main + FirstName + + + true + equals + type + Main + text + + + false + equals + xpath + Main + id("FirstName") + + + true + equals + xpath:attributes + //input[@id='FirstName'] + + + false + equals + xpath:idRelative + //form[@id='details']/table/tbody/tr[3]/td[2]/span/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[2]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Middle Name'])[1]/preceding::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Gender'])[1]/preceding::input[2] + + + false + equals + xpath:position + //tr[3]/td[2]/span/input + + diff --git a/KatalonCucumberBDD/Profiles/default.glbl b/KatalonCucumberBDD/Profiles/default.glbl new file mode 100644 index 000000000..de1027f04 --- /dev/null +++ b/KatalonCucumberBDD/Profiles/default.glbl @@ -0,0 +1,7 @@ + + + + default + + true + diff --git a/KatalonCucumberBDD/README.md b/KatalonCucumberBDD/README.md new file mode 100644 index 000000000..21e39b2ff --- /dev/null +++ b/KatalonCucumberBDD/README.md @@ -0,0 +1,9 @@ +## Katalon with Cucumber BDD support + +Starting Katalon Studio 5.7, Cucumber API is supported as an part of Katalon studio out-of-box, meaning, you dont really have to add any cucumber library to Katalon studio as an external JAR reference, rather, its available within Katalon studio. + +## About this Repo +This repo contains the complete demostration of working with Cucumber BDD in Katalon Studio 5.7 + +## Video Demostration +Here is the complete video explaning how to get started with Cucumber in Katalon studio https://www.youtube.com/watch?v=vwCSfUhsivY diff --git a/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy b/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy new file mode 100644 index 000000000..ce5e87e42 --- /dev/null +++ b/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy @@ -0,0 +1,18 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.ea.steps.CucumberEARunner +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +CucumberKW.runWithCucumberRunner(CucumberEARunner.class) diff --git a/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc b/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc new file mode 100644 index 000000000..5aea93271 --- /dev/null +++ b/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc @@ -0,0 +1,8 @@ + + + + ExecuteAutomation_TC1 + + + 9ccc1ff2-1a70-4f4b-ad95-dad93a1390b8 + diff --git a/KatalonCucumberBDD/Test Suites/TestSuite1.groovy b/KatalonCucumberBDD/Test Suites/TestSuite1.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/KatalonCucumberBDD/Test Suites/TestSuite1.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/KatalonCucumberBDD/Test Suites/TestSuite1.ts b/KatalonCucumberBDD/Test Suites/TestSuite1.ts new file mode 100644 index 000000000..12a451e12 --- /dev/null +++ b/KatalonCucumberBDD/Test Suites/TestSuite1.ts @@ -0,0 +1,20 @@ + + + + TestSuite1 + + false + 2018-12-20T13:53:39 + + 0 + 30 + true + false + e8a1ffd6-0ef9-4ac4-9cad-c711a822a0a5 + + 2521c26f-59d1-446f-9fbe-59281ccceb99 + false + true + Test Cases/ExecuteAutomation_TC1 + + diff --git a/KatalonCucumberBDD/console.properties b/KatalonCucumberBDD/console.properties new file mode 100644 index 000000000..710966d84 --- /dev/null +++ b/KatalonCucumberBDD/console.properties @@ -0,0 +1,7 @@ +#Sat Sep 08 18:41:21 NZST 2018 +deviceId= +kobitonDeviceId= +qTestDestId= +qTestDestType= +remoteWebDriverType=Selenium +remoteWebDriverUrl= diff --git a/KatalonCucumberBDD/runTests.bat b/KatalonCucumberBDD/runTests.bat new file mode 100644 index 000000000..41e1656d0 --- /dev/null +++ b/KatalonCucumberBDD/runTests.bat @@ -0,0 +1,3 @@ +echo "Starting tests" + +C:\Users\PaulR\Documents\Katalon_Studio_Windows_64-5.9.0\Katalon_Studio_Windows_64-5.9.0\katalon -noSplash -runMode=console -projectPath="C:\Users\PaulR\Documents\OCWA\OCWA\KatalonCucumberBDD\KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/KatalonCucumberBDD/runTests.sh b/KatalonCucumberBDD/runTests.sh new file mode 100644 index 000000000..40c1e77a8 --- /dev/null +++ b/KatalonCucumberBDD/runTests.sh @@ -0,0 +1,3 @@ +echo "Starting tests" + +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/KatalonCucumberBDD/KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties new file mode 100644 index 000000000..e69de29bb diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties new file mode 100644 index 000000000..e69de29bb diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties new file mode 100644 index 000000000..a50388cc6 --- /dev/null +++ b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties @@ -0,0 +1,2 @@ +#Sat Sep 08 18:41:20 NZST 2018 +execution.default.selectingCapturedObjectSelectorMethod="XPATH" diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties new file mode 100644 index 000000000..e69de29bb diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties new file mode 100644 index 000000000..e69de29bb diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties new file mode 100644 index 000000000..e69de29bb diff --git a/config/.metadata/.plugins/org.eclipse.core.resources/.projects/C%%Users%PaulR%Documents%OCWA%OCWA%KatalonCucumberBDD%KatalonCucumber.prj/.syncinfo.snap b/config/.metadata/.plugins/org.eclipse.core.resources/.projects/C%%Users%PaulR%Documents%OCWA%OCWA%KatalonCucumberBDD%KatalonCucumber.prj/.syncinfo.snap new file mode 100644 index 0000000000000000000000000000000000000000..0b368ce14fbcdffc79d020bc00b88646cda52674 GIT binary patch literal 32 acmZ?R*xjhShe1S2b=vdAllRFvpz#6ORt Date: Thu, 20 Dec 2018 14:06:32 -0800 Subject: [PATCH 057/226] removed special chars From e3f4115285350c4770668d6d7db2a992b2fe7b2f Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 14:18:32 -0800 Subject: [PATCH 058/226] fixed path for KatalonCucumberBDD --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ce8e4d0d..defd89470 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,7 +90,7 @@ matrix: - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/KatalonCucumber + - cd /home/travis/build/bcgov/OCWA/KatalonCucumberBDD - chmod ugo+x runTests.sh #- chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up @@ -104,9 +104,9 @@ matrix: - echo $CLASSPATH #RUN Integration Tests - cd /home/travis/build/bcgov/OCWA - - cat ./KatalonCucumber/console.properties - - xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumber/runTests.sh - - cat ./KatalonCucumber/.classpath + - cat ./KatalonCucumberBDD/console.properties + - xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumberBDD/runTests.sh + - cat ./KatalonCucumberBDD/.classpath #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From 9b9f08c60f820071b9ae8accba6271e06885053f Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 14:43:00 -0800 Subject: [PATCH 059/226] fixed executionProfile --- KatalonCucumberBDD/runTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KatalonCucumberBDD/runTests.sh b/KatalonCucumberBDD/runTests.sh index 40c1e77a8..e88497f6a 100644 --- a/KatalonCucumberBDD/runTests.sh +++ b/KatalonCucumberBDD/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/KatalonCucumberBDD/KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/KatalonCucumberBDD/KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From 276b5a07bfc90f8cc85cadc403d77c595eeeb84c Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 15:14:39 -0800 Subject: [PATCH 060/226] update to classpath --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index defd89470..cc072f0fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ matrix: - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins + - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar - echo $CLASSPATH #RUN Integration Tests - cd /home/travis/build/bcgov/OCWA From 84686705c5b8b236734e0f75a71b8067856dbc88 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 15:48:18 -0800 Subject: [PATCH 061/226] try an alternate approach to calling katalon --- .travis.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc072f0fa..32beb1efc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,20 +94,22 @@ matrix: - chmod ugo+x runTests.sh #- chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up - - cd /home/travis/build/bcgov + #- cd /home/travis/build/bcgov + - cd /usr/local/bin - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar - - echo $CLASSPATH + #- export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} + #- export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar + #- echo $CLASSPATH #RUN Integration Tests - - cd /home/travis/build/bcgov/OCWA - - cat ./KatalonCucumberBDD/console.properties - - xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumberBDD/runTests.sh - - cat ./KatalonCucumberBDD/.classpath + - cd Katalon_Studio_Linux_64-${KATALON_VERSION} + #- cd /home/travis/build/bcgov/OCWA + #- xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumberBDD/runTests.sh + #- cat ./KatalonCucumberBDD/.classpath #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" env: From 1cd360826d4999c21ae1062e185dd3fcd9253672 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 16:20:00 -0800 Subject: [PATCH 062/226] sudo stuff to make it happen --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32beb1efc..c9b7a7566 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,16 +90,16 @@ matrix: - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/KatalonCucumberBDD + - cd /home/travis/build/bcgov/OCWA/ui_tests - chmod ugo+x runTests.sh #- chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up #- cd /home/travis/build/bcgov - cd /usr/local/bin - - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} + - sudo wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} #- export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} #- export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar #- echo $CLASSPATH From 0629c236a43afe03cf513994b7880aa0f6cf0a0f Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 11:54:37 -0800 Subject: [PATCH 063/226] cleaned up Katalon tests --- .gitignore | 419 +++++++++--------- .travis.yml | 17 +- KatalonCucumberBDD/.gitignore | 7 - KatalonCucumberBDD/.project | 74 ---- .../Include/config/log.properties | 6 - .../Include/features/Login.feature | 32 -- .../com/ea/steps/CucumberEARunner.groovy | 14 - .../groovy/com/ea/steps/LoginSteps.groovy | 103 ----- KatalonCucumberBDD/KatalonCucumber.prj | 28 -- KatalonCucumberBDD/Libs/CustomKeywords.groovy | 5 - .../Libs/internal/GlobalVariable.groovy | 26 -- .../input_EnglishHindi_Save.rs | 80 ---- .../input_Initial_Initial.rs | 86 ---- .../input_Login_Login.rs | 86 ---- .../input_Login_Password.rs | 86 ---- .../input_Login_UserName.rs | 86 ---- .../input__FirstName.rs | 86 ---- KatalonCucumberBDD/Profiles/default.glbl | 7 - KatalonCucumberBDD/README.md | 9 - .../Script1536389635449.groovy | 18 - .../Test Cases/ExecuteAutomation_TC1.tc | 8 - .../Test Suites/TestSuite1.groovy | 66 --- KatalonCucumberBDD/Test Suites/TestSuite1.ts | 20 - KatalonCucumberBDD/console.properties | 7 - KatalonCucumberBDD/runTests.bat | 3 - KatalonCucumberBDD/runTests.sh | 3 - ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 0 ...com.kms.katalon.execution.webui.properties | 2 - ...s.katalon.integration.analytics.properties | 0 ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 config/recent_projects | Bin 0 -> 2032 bytes ui-tests/.gitignore | 5 - ui-tests/.project | 56 --- ui-tests/Include/config/log.properties | 6 - ...discussion_status_approved_request.feature | 7 - .../manual_output_checking_component.feature | 19 - .../team_sharing_component.feature | 22 - .../output_checker/adjudicate request.feature | 17 - .../output_checker/claim_request.feature | 14 - .../output_checker/undo_approval.feature | 9 - ...tered_requests_for_output_checkers.feature | 12 - ..._approved_output_files_outside_SRE.feature | 7 - .../requester/canceling_request.feature | 7 - .../requester/create_a_new_request.feature | 39 -- .../features/requester/draft_requests.feature | 16 - .../edit_previously_submitted_request.feature | 8 - .../features/requester/notifications.feature | 23 - .../requester/request_discussion.feature | 15 - ...edit_project_team_members_requests.feature | 15 - .../requester/see_requests_by_status.feature | 18 - .../requester/view_request_details.feature | 7 - .../scripts/groovy/MyCucumberRunner.groovy | 26 -- .../groovy/Requester_step_def_kr.groovy | 100 ----- .../groovy/Requester_step_def_ks.groovy | 156 ------- ui-tests/LICENSE | 201 --------- ui-tests/Libs/CustomKeywords.groovy | 9 - ui-tests/Libs/internal/GlobalVariable.groovy | 33 -- ui-tests/OCWA.prj | 28 -- .../a_OCWA Export Tool.rs | 86 ---- .../button_All.rs | 97 ---- .../div_My RequestsAllDraftQueuedI.rs | 67 --- .../div_Request Name_Content-ve26f.rs | 66 --- .../div_You have no requests.rs | 73 --- .../h1_gfggggg.rs | 72 --- .../Page_OCWA Development Version/span_All.rs | 72 --- .../span_Cancel (1).rs | 72 --- .../span_Cancel.rs | 72 --- .../span_Draft.rs | 72 --- .../span_Login (1).rs | 54 --- .../span_New Request.rs | 83 ---- .../span_Save Close (1).rs | 74 ---- .../span_Save Close.rs | 70 --- .../table_StatusRequest Identifier.rs | 67 --- ui-tests/Profiles/Travis.glbl | 12 - .../Script1544053608217.groovy | 28 -- .../Script1544808549240.groovy | 23 - .../Requester/Run cucumber tests.tc | 8 - .../Test Cases/Requester/test_case_testing.tc | 8 - .../Test Suites/Run OCWA test cases.groovy | 66 --- ui-tests/Test Suites/Run OCWA test cases.ts | 20 - ui-tests/Test Suites/TestingTestSuite.groovy | 66 --- ui-tests/Test Suites/TestingTestSuite.ts | 20 - .../bin/groovy/Requester_step_def_kr.class | Bin 6547 -> 0 bytes .../bin/groovy/Requester_step_def_ks.class | Bin 6842 -> 0 bytes .../random_test_request_name.class | Bin 3283 -> 0 bytes ui-tests/bin/lib/CustomKeywords.class | Bin 2440 -> 0 bytes .../bin/lib/internal/GlobalVariable.class | Bin 3510 -> 0 bytes ui-tests/console.properties | 5 - ui-tests/runTests.sh | 3 - ui-tests/runTestsTesting.sh | 3 - ...atalon.core.db.DatabaseSettings.properties | 0 ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 6 - ...com.kms.katalon.execution.webui.properties | 6 - ...s.katalon.integration.analytics.properties | 2 - ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 ui-tests/sonar-project.properties | 32 -- ui_tests/.gitignore | 1 + ui_tests/.project | 166 +++---- ui_tests/Data Files/TestFile1.dat | 16 + ui_tests/Data Files/TestFile2.dat | 16 + ui_tests/Include/features/Login.feature | 32 -- .../groovy/Requester_step_def_ks.groovy | 159 +++---- .../com/ea/steps/CucumberEARunner.groovy | 14 - .../groovy/com/ea/steps/LoginSteps.groovy | 103 ----- .../random_test_request_name.groovy | 0 ui_tests/Libs/CustomKeywords.groovy | 4 + ui_tests/Libs/internal/GlobalVariable.groovy | 2 +- .../input_Password_login.rs | 214 ++++----- .../input_Password_password.rs | 214 ++++----- .../input_Username or email_userna.rs | 226 +++++----- .../a_Discussion.rs | 189 ++++---- .../input_Request Name_name.rs | 222 +++++----- .../span_Save (1).rs | 130 +++--- .../span_Submit for Review.rs | 108 ++--- .../span_Withdraw.rs | 152 +++---- .../Script1536389635449.groovy | 18 - .../Script1545256102660.groovy | 4 + ui_tests/Test Cases/ExecuteAutomation_TC1.tc | 8 - ui_tests/Test Suites/CucumberSuite.ts | 40 +- ui_tests/Test Suites/TestSuite1.groovy | 66 --- ui_tests/Test Suites/TestSuite1.ts | 20 - ui_tests/runTests.sh | 3 - ...s.katalon.integration.analytics.properties | 9 + 127 files changed, 1185 insertions(+), 4615 deletions(-) delete mode 100644 KatalonCucumberBDD/.gitignore delete mode 100644 KatalonCucumberBDD/.project delete mode 100644 KatalonCucumberBDD/Include/config/log.properties delete mode 100644 KatalonCucumberBDD/Include/features/Login.feature delete mode 100644 KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy delete mode 100644 KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy delete mode 100644 KatalonCucumberBDD/KatalonCucumber.prj delete mode 100644 KatalonCucumberBDD/Libs/CustomKeywords.groovy delete mode 100644 KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs delete mode 100644 KatalonCucumberBDD/Profiles/default.glbl delete mode 100644 KatalonCucumberBDD/README.md delete mode 100644 KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy delete mode 100644 KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc delete mode 100644 KatalonCucumberBDD/Test Suites/TestSuite1.groovy delete mode 100644 KatalonCucumberBDD/Test Suites/TestSuite1.ts delete mode 100644 KatalonCucumberBDD/console.properties delete mode 100644 KatalonCucumberBDD/runTests.bat delete mode 100644 KatalonCucumberBDD/runTests.sh delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties create mode 100644 config/recent_projects delete mode 100644 ui-tests/.gitignore delete mode 100644 ui-tests/.project delete mode 100644 ui-tests/Include/config/log.properties delete mode 100644 ui-tests/Include/features/administator/export_discussion_status_approved_request.feature delete mode 100644 ui-tests/Include/features/administator/manual_output_checking_component.feature delete mode 100644 ui-tests/Include/features/administator/team_sharing_component.feature delete mode 100644 ui-tests/Include/features/output_checker/adjudicate request.feature delete mode 100644 ui-tests/Include/features/output_checker/claim_request.feature delete mode 100644 ui-tests/Include/features/output_checker/undo_approval.feature delete mode 100644 ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature delete mode 100644 ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature delete mode 100644 ui-tests/Include/features/requester/canceling_request.feature delete mode 100644 ui-tests/Include/features/requester/create_a_new_request.feature delete mode 100644 ui-tests/Include/features/requester/draft_requests.feature delete mode 100644 ui-tests/Include/features/requester/edit_previously_submitted_request.feature delete mode 100644 ui-tests/Include/features/requester/notifications.feature delete mode 100644 ui-tests/Include/features/requester/request_discussion.feature delete mode 100644 ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature delete mode 100644 ui-tests/Include/features/requester/see_requests_by_status.feature delete mode 100644 ui-tests/Include/features/requester/view_request_details.feature delete mode 100644 ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy delete mode 100644 ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy delete mode 100644 ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy delete mode 100644 ui-tests/LICENSE delete mode 100644 ui-tests/Libs/CustomKeywords.groovy delete mode 100644 ui-tests/Libs/internal/GlobalVariable.groovy delete mode 100644 ui-tests/OCWA.prj delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs delete mode 100644 ui-tests/Profiles/Travis.glbl delete mode 100644 ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy delete mode 100644 ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy delete mode 100644 ui-tests/Test Cases/Requester/Run cucumber tests.tc delete mode 100644 ui-tests/Test Cases/Requester/test_case_testing.tc delete mode 100644 ui-tests/Test Suites/Run OCWA test cases.groovy delete mode 100644 ui-tests/Test Suites/Run OCWA test cases.ts delete mode 100644 ui-tests/Test Suites/TestingTestSuite.groovy delete mode 100644 ui-tests/Test Suites/TestingTestSuite.ts delete mode 100644 ui-tests/bin/groovy/Requester_step_def_kr.class delete mode 100644 ui-tests/bin/groovy/Requester_step_def_ks.class delete mode 100644 ui-tests/bin/keyword/test_OCWA_keywords/random_test_request_name.class delete mode 100644 ui-tests/bin/lib/CustomKeywords.class delete mode 100644 ui-tests/bin/lib/internal/GlobalVariable.class delete mode 100644 ui-tests/console.properties delete mode 100644 ui-tests/runTests.sh delete mode 100644 ui-tests/runTestsTesting.sh delete mode 100644 ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.execution.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.execution.webui.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.jira.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties delete mode 100644 ui-tests/sonar-project.properties create mode 100644 ui_tests/Data Files/TestFile1.dat create mode 100644 ui_tests/Data Files/TestFile2.dat delete mode 100644 ui_tests/Include/features/Login.feature delete mode 100644 ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy delete mode 100644 ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy rename {ui-tests => ui_tests}/Keywords/test_OCWA_keywords/random_test_request_name.groovy (100%) rename {ui-tests => ui_tests}/Object Repository/Page_Log in to ocwa/input_Password_login.rs (96%) rename {ui-tests => ui_tests}/Object Repository/Page_Log in to ocwa/input_Password_password.rs (96%) rename {ui-tests => ui_tests}/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs (96%) rename ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs => ui_tests/Object Repository/Page_OCWA Development Version/a_Discussion.rs (58%) rename {ui-tests => ui_tests}/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs (97%) rename ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs => ui_tests/Object Repository/Page_OCWA Development Version/span_Save (1).rs (64%) rename ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs => ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs (64%) rename ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs => ui_tests/Object Repository/Page_OCWA Development Version/span_Withdraw.rs (67%) delete mode 100644 ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy delete mode 100644 ui_tests/Test Cases/ExecuteAutomation_TC1.tc delete mode 100644 ui_tests/Test Suites/TestSuite1.groovy delete mode 100644 ui_tests/Test Suites/TestSuite1.ts delete mode 100644 ui_tests/runTests.sh diff --git a/.gitignore b/.gitignore index 855dcf914..bfb1a55a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,208 +1,211 @@ -# General Ignore -#bin/ -.idea -.DS_Store - -#Helm -helm/ocwa/charts/* -helm/ocwa/config.yaml - -# Golang Ignore - -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - - -# Node Ignore - -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - - -# Python Ignore - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -#lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ +# General Ignore +#bin/ +.idea +.DS_Store + +#Helm +helm/ocwa/charts/* +helm/ocwa/config.yaml + +# Golang Ignore + +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + + +# Node Ignore + +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless + + +# Python Ignore + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +#lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ + +#Katalon +config/.metadata \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index c9b7a7566..31cfdfca9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,29 +86,18 @@ matrix: - sudo pip3 install -e . - python3 wsgi.py & - #Katalon requires OpenJDK 8 installed seperately + #Katalon requires OpenJDK 8 installed separately - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk - #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui_tests - - chmod ugo+x runTests.sh - #- chmod ugo+x runTestsTesting.sh - #added line to install Katalon a directory up - #- cd /home/travis/build/bcgov + #Install Katalon Studios - cd /usr/local/bin - sudo wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - #- export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - #- export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar - #- echo $CLASSPATH + #RUN Integration Tests - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - #- cd /home/travis/build/bcgov/OCWA - #- xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumberBDD/runTests.sh - #- cat ./KatalonCucumberBDD/.classpath - #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" diff --git a/KatalonCucumberBDD/.gitignore b/KatalonCucumberBDD/.gitignore deleted file mode 100644 index b7c73c1f6..000000000 --- a/KatalonCucumberBDD/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Katalon Studio -Reports/* -ReportFolder/* -.classpath -.settings -/bin/ -Libs/TempTest*.groovy diff --git a/KatalonCucumberBDD/.project b/KatalonCucumberBDD/.project deleted file mode 100644 index fa1b5267e..000000000 --- a/KatalonCucumberBDD/.project +++ /dev/null @@ -1,74 +0,0 @@ - - - C%%Users%PaulR%Documents%KatalonCucumberBDD%KatalonCucumber.prj - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.groovy.core.groovyNature - org.eclipse.jdt.core.javanature - - - - 1545169329215 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1545169329228 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 1545342090617 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1545342090664 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 1545342237726 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1545342237742 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - diff --git a/KatalonCucumberBDD/Include/config/log.properties b/KatalonCucumberBDD/Include/config/log.properties deleted file mode 100644 index 8142b1dc2..000000000 --- a/KatalonCucumberBDD/Include/config/log.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file is used to configure Katalon Studio execution log levels. - -# When you need to troubleshoot Katalon Studio issue -# logging.level.com.kms=TRACE - -# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/KatalonCucumberBDD/Include/features/Login.feature b/KatalonCucumberBDD/Include/features/Login.feature deleted file mode 100644 index 1b8ab732f..000000000 --- a/KatalonCucumberBDD/Include/features/Login.feature +++ /dev/null @@ -1,32 +0,0 @@ -#Author: your.email@your.domain.com -#Keywords Summary : -#Feature: List of scenarios. -#Scenario: Business rule through list of steps with arguments. -#Given: Some precondition step -#When: Some key actions -#Then: To observe outcomes or validation -#And,But: To enumerate more Given,When,Then steps -#Scenario Outline: List of steps for data-driven as an Examples and -#Examples: Container for s table -#Background: List of steps run before each of the scenarios -#""" (Doc Strings) -#| (Data Tables) -#@ (Tags/Labels):To group Scenarios -#<> (placeholder) -#"" -## (Comments) -#Sample Feature Definition Template - - -@loginFeature -Feature: Login - Test the login functionality of the application - - @smoke - Scenario: Test the login functionality of EA application - Given I navigate to the login page - And I enter the following for Login - | username | password | - | admin | adminpassword | - And I click the login button - Then I should see the home page \ No newline at end of file diff --git a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy deleted file mode 100644 index a720b7a3e..000000000 --- a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy +++ /dev/null @@ -1,14 +0,0 @@ -package com.ea.steps - - -import org.junit.runner.RunWith; - -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; - - - -@RunWith(Cucumber.class) -@CucumberOptions(features="KatalonCucumberBDD/Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) -public class CucumberEARunner { -} diff --git a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy deleted file mode 100644 index a0de37450..000000000 --- a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy +++ /dev/null @@ -1,103 +0,0 @@ -package com.ea.steps -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI - -import cucumber.api.TypeRegistry; -import cucumber.api.TypeRegistryConfigurer; -import cucumber.api.java.en.And -import cucumber.api.java.en.Given -import cucumber.api.java.en.Then -import cucumber.api.java.en.When -import io.cucumber.datatable.DataTableType; -import io.cucumber.datatable.TableEntryTransformer; - - -/* - * Author: Karthik KK - * Company: ExecuteAutomation - * Type: StepDefinition - * Step : LoginStep - */ -class LoginSteps { - @Given("I navigate to the login page") - def I_navigate_to_the_login_page() { - WebUI.openBrowser('') - WebUI.navigateToUrl('http://www.executeautomation.com/demosite/Login.html') - } - - - //Obsolete step - @When('I enter the username as "(.*) and password as "(.*)"') - def I_enter_username_password(String userName, String password) { - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), userName) - - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), password) - } - - @And("I enter the following for Login") - def I_enter_the_following_for_login(List table){ - // Way 1 - To get data from DataTable Type - // List> data = table.asMaps(String.class, String.class); - - // Way 2 - To get work with custom types using Lust - // //Create an ArrayList - // List users = new ArrayList(); - // //Store all the users - // users = table.asList(User.class); - - - //Iterate through the values - for (User user: table){ - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), user.username) - - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), user.password) - } - } - - - @Then("I click the login button") - def I_Click_login_button() { - WebUI.click(findTestObject('Object Repository/Page_Execute Automation/input_Login_Login')) - } - - @Then("I should see the home page") - def I_Should_see_the_home_page(){ - - //Assertions has been done ! - } -} - - -//Custom class responsible to get UserName and Password from table steps -class User { - public String username; - public String password; - - public User(String userName, String passWord) { - username= userName; - password = passWord; - } -} - - -//Custom Transformer to convert the custom User type -class Configurer implements TypeRegistryConfigurer { - - @Override - public void configureTypeRegistry(TypeRegistry registry) { - - registry.defineDataTableType(new DataTableType(User.class, new TableEntryTransformer() { - @Override - public User transform(Map entry) { - return new User(entry.get("username"),entry.get("password")); - } - })); - } - - @Override - public Locale locale() { - return Locale.ENGLISH; - } - -} diff --git a/KatalonCucumberBDD/KatalonCucumber.prj b/KatalonCucumberBDD/KatalonCucumber.prj deleted file mode 100644 index c48d3b350..000000000 --- a/KatalonCucumberBDD/KatalonCucumber.prj +++ /dev/null @@ -1,28 +0,0 @@ - - - Katalon with Cucumber support - KatalonCucumber - - 3d119e91-3135-4c99-aab6-6022650ddbe1 - 5.9.0 - 0 - - - - Include/scripts/groovy - - - - - Include/scripts/groovy - - - Include/features - - - Include/config - - - - GENERIC - diff --git a/KatalonCucumberBDD/Libs/CustomKeywords.groovy b/KatalonCucumberBDD/Libs/CustomKeywords.groovy deleted file mode 100644 index c595a4f8a..000000000 --- a/KatalonCucumberBDD/Libs/CustomKeywords.groovy +++ /dev/null @@ -1,5 +0,0 @@ - -/** - * This class is generated automatically by Katalon Studio and should not be modified or deleted. - */ - diff --git a/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy b/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy deleted file mode 100644 index 0f60ebe2b..000000000 --- a/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy +++ /dev/null @@ -1,26 +0,0 @@ -package internal - -import com.kms.katalon.core.configuration.RunConfiguration -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase - -/** - * This class is generated automatically by Katalon Studio and should not be modified or deleted. - */ -public class GlobalVariable { - - - static { - def allVariables = [:] - allVariables.put('default', [:]) - - String profileName = RunConfiguration.getExecutionProfile() - - def selectedVariables = allVariables[profileName] - - } -} diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs deleted file mode 100644 index ec456a8cc..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs +++ /dev/null @@ -1,80 +0,0 @@ - - - - input_EnglishHindi_Save - - ecd9d263-24cb-4f55-86e0-5f8b37295ddd - - - XPATH - //input[@name='Save'] - - - XPATH - false - - true - equals - tag - Main - input - - - true - equals - name - Main - Save - - - true - equals - type - Main - button - - - false - equals - value - Main - Save - - - false - equals - xpath - Main - id("details")/table[1]/tbody[1]/tr[7]/td[1]/input[1] - - - true - equals - xpath:attributes - //input[@name='Save'] - - - false - equals - xpath:idRelative - //form[@id='details']/table/tbody/tr[7]/td/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Languages Known'])[1]/following::input[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Click For'])[1]/preceding::input[1] - - - false - equals - xpath:position - //tr[7]/td/input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs deleted file mode 100644 index 4c0d2089d..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input_Initial_Initial - - 4147d414-db74-43aa-93cf-b83588a4a5ac - - - XPATH - //input[@id='Initial'] - - - XPATH - false - - true - equals - tag - Main - input - - - true - equals - id - Main - Initial - - - true - equals - name - Main - Initial - - - true - equals - type - Main - text - - - false - equals - xpath - Main - id("Initial") - - - true - equals - xpath:attributes - //input[@id='Initial'] - - - false - equals - xpath:idRelative - //form[@id='details']/table/tbody/tr[2]/td[2]/span/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Initial'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[2]/preceding::input[1] - - - false - equals - xpath:position - //input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs deleted file mode 100644 index 1f21fdbfa..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input_Login_Login - - f6f35be9-c6a2-4e27-91ea-56d2eb891b0f - - - XPATH - //input[@name='Login'] - - - XPATH - false - - true - equals - tag - Main - input - - - true - equals - name - Main - Login - - - true - equals - type - Main - submit - - - false - equals - value - Main - Login - - - false - equals - xpath - Main - id("userName")/p[3]/input[1] - - - true - equals - xpath:attributes - //input[@name='Login'] - - - false - equals - xpath:idRelative - //form[@id='userName']/p[3]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[3]/input[1]')])[1]/preceding::input[1] - - - false - equals - xpath:position - //p[3]/input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs deleted file mode 100644 index 55092ed9f..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input_Login_Password - - 8b324a72-4913-4c7a-b70a-82f50bd94358 - - - XPATH - //input[@name='Password'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - maxlength - Main - 10 - - - true - equals - name - Main - Password - - - true - equals - type - Main - text - - - false - equals - xpath - Main - id("userName")/p[2]/input[1] - - - true - equals - xpath:attributes - //input[@name='Password'] - - - false - equals - xpath:idRelative - //form[@id='userName']/p[2]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[1]/input[1]')])[1]/preceding::input[2] - - - false - equals - xpath:position - //p[2]/input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs deleted file mode 100644 index a0645ef4b..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input_Login_UserName - - ae864cbc-fb6c-426f-a41c-4fa206b8b905 - - - XPATH - //input[@name='UserName'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - maxlength - Main - 10 - - - true - equals - name - Main - UserName - - - true - equals - type - Main - text - - - false - equals - xpath - Main - id("userName")/p[1]/input[1] - - - true - equals - xpath:attributes - //input[@name='UserName'] - - - false - equals - xpath:idRelative - //form[@id='userName']/p/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[1]/input[1]')])[1]/preceding::input[3] - - - false - equals - xpath:position - //input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs deleted file mode 100644 index 5bb0a455f..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input__FirstName - - 96539eeb-add3-4a43-8e44-b9dcb7056248 - - - XPATH - //input[@id='FirstName'] - - - XPATH - false - - true - equals - tag - Main - input - - - true - equals - id - Main - FirstName - - - true - equals - name - Main - FirstName - - - true - equals - type - Main - text - - - false - equals - xpath - Main - id("FirstName") - - - true - equals - xpath:attributes - //input[@id='FirstName'] - - - false - equals - xpath:idRelative - //form[@id='details']/table/tbody/tr[3]/td[2]/span/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[2]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Middle Name'])[1]/preceding::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Gender'])[1]/preceding::input[2] - - - false - equals - xpath:position - //tr[3]/td[2]/span/input - - diff --git a/KatalonCucumberBDD/Profiles/default.glbl b/KatalonCucumberBDD/Profiles/default.glbl deleted file mode 100644 index de1027f04..000000000 --- a/KatalonCucumberBDD/Profiles/default.glbl +++ /dev/null @@ -1,7 +0,0 @@ - - - - default - - true - diff --git a/KatalonCucumberBDD/README.md b/KatalonCucumberBDD/README.md deleted file mode 100644 index 21e39b2ff..000000000 --- a/KatalonCucumberBDD/README.md +++ /dev/null @@ -1,9 +0,0 @@ -## Katalon with Cucumber BDD support - -Starting Katalon Studio 5.7, Cucumber API is supported as an part of Katalon studio out-of-box, meaning, you dont really have to add any cucumber library to Katalon studio as an external JAR reference, rather, its available within Katalon studio. - -## About this Repo -This repo contains the complete demostration of working with Cucumber BDD in Katalon Studio 5.7 - -## Video Demostration -Here is the complete video explaning how to get started with Cucumber in Katalon studio https://www.youtube.com/watch?v=vwCSfUhsivY diff --git a/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy b/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy deleted file mode 100644 index ce5e87e42..000000000 --- a/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy +++ /dev/null @@ -1,18 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.ea.steps.CucumberEARunner -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - -CucumberKW.runWithCucumberRunner(CucumberEARunner.class) diff --git a/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc b/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc deleted file mode 100644 index 5aea93271..000000000 --- a/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc +++ /dev/null @@ -1,8 +0,0 @@ - - - - ExecuteAutomation_TC1 - - - 9ccc1ff2-1a70-4f4b-ad95-dad93a1390b8 - diff --git a/KatalonCucumberBDD/Test Suites/TestSuite1.groovy b/KatalonCucumberBDD/Test Suites/TestSuite1.groovy deleted file mode 100644 index 49ab4777d..000000000 --- a/KatalonCucumberBDD/Test Suites/TestSuite1.groovy +++ /dev/null @@ -1,66 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject - -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile - -import internal.GlobalVariable as GlobalVariable - -import com.kms.katalon.core.annotation.SetUp -import com.kms.katalon.core.annotation.SetupTestCase -import com.kms.katalon.core.annotation.TearDown -import com.kms.katalon.core.annotation.TearDownTestCase - -/** - * Some methods below are samples for using SetUp/TearDown in a test suite. - */ - -/** - * Setup test suite environment. - */ -@SetUp(skipped = true) // Please change skipped to be false to activate this method. -def setUp() { - // Put your code here. -} - -/** - * Clean test suites environment. - */ -@TearDown(skipped = true) // Please change skipped to be false to activate this method. -def tearDown() { - // Put your code here. -} - -/** - * Run before each test case starts. - */ -@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. -def setupTestCase() { - // Put your code here. -} - -/** - * Run after each test case ends. - */ -@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. -def tearDownTestCase() { - // Put your code here. -} - -/** - * References: - * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ - */ \ No newline at end of file diff --git a/KatalonCucumberBDD/Test Suites/TestSuite1.ts b/KatalonCucumberBDD/Test Suites/TestSuite1.ts deleted file mode 100644 index 12a451e12..000000000 --- a/KatalonCucumberBDD/Test Suites/TestSuite1.ts +++ /dev/null @@ -1,20 +0,0 @@ - - - - TestSuite1 - - false - 2018-12-20T13:53:39 - - 0 - 30 - true - false - e8a1ffd6-0ef9-4ac4-9cad-c711a822a0a5 - - 2521c26f-59d1-446f-9fbe-59281ccceb99 - false - true - Test Cases/ExecuteAutomation_TC1 - - diff --git a/KatalonCucumberBDD/console.properties b/KatalonCucumberBDD/console.properties deleted file mode 100644 index 710966d84..000000000 --- a/KatalonCucumberBDD/console.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Sat Sep 08 18:41:21 NZST 2018 -deviceId= -kobitonDeviceId= -qTestDestId= -qTestDestType= -remoteWebDriverType=Selenium -remoteWebDriverUrl= diff --git a/KatalonCucumberBDD/runTests.bat b/KatalonCucumberBDD/runTests.bat deleted file mode 100644 index 41e1656d0..000000000 --- a/KatalonCucumberBDD/runTests.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -C:\Users\PaulR\Documents\Katalon_Studio_Windows_64-5.9.0\Katalon_Studio_Windows_64-5.9.0\katalon -noSplash -runMode=console -projectPath="C:\Users\PaulR\Documents\OCWA\OCWA\KatalonCucumberBDD\KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/KatalonCucumberBDD/runTests.sh b/KatalonCucumberBDD/runTests.sh deleted file mode 100644 index e88497f6a..000000000 --- a/KatalonCucumberBDD/runTests.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/KatalonCucumberBDD/KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties deleted file mode 100644 index a50388cc6..000000000 --- a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Sat Sep 08 18:41:20 NZST 2018 -execution.default.selectingCapturedObjectSelectorMethod="XPATH" diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/config/recent_projects b/config/recent_projects new file mode 100644 index 0000000000000000000000000000000000000000..f5a273b5ca102d8556d812db86bbd407af5b96ab GIT binary patch literal 2032 zcmb7F&udgy6h8AqOf|nqO2NuNN?RAHd2hxvp`)~*Gm|p-VuDFp3IVzE-ktHr_se_l zOWt%LSW3ZdX@wTL>`v&ui_+4CB8VsmF5I-smbmdB@Z5Xfm`q@FlEn)-=iGC@bH4Ap zxw8vL1c&J@vQ4Z+GT%DSIq5n~$n@sp(oc8EF9paop(xnbG>riuzf)9SJapQP0_$2J ztZPIPKME}xN+!Ej%%d&pN^8~pZs;hUQ9rpnjI6;#Oghwwh_}uH8YR+!;>Jd^E@8@1 zKy06c9eYi37Iw}#Fy4-Qk8&q+iDXfD9d1Cufr)^1IFZ!*f^xAJKFO(zI2vh8LXUdu zoKgdz=?MvwroS50Rx@Jv6Xw85Ov3}^>Y}0pVvVE;%^|_QodBA$x%%@fp!I<%v@J}=058o`WEv-Izn1`GL zQ|wiR&N3?WJlOcu>l*L1`{TdQW_M4GewPQpL!|+S%+-cm&8`E-J*1_^sUoL;<#i0< zLPk}=a^$f#qn<)_OdX=aa_v?!kuNgPKUg$WWS zvXWjhjuql*^sR&s=DkX#N~@K*`O5sl+{bRUI!8!rac;4E=FH+k+4EYoB4MF+c5_3Z zr#4qf;$PmZM|ck|Tx_n?zC3R}2X47gN9!J0u&P#B!`5oh&jgq``T}o$IQk6qc2In@ z`(x?-JmejiG+s2MDg&$W(4&*0Dn{^U= zYVeWy{rfxH|4#q*kG5DL;l2@szDL44&CvA|kJ?7b!tU@W+V1Y{pr8>HhC#4zo<0QA zFY3QGKmGaAp%Ca5yoX-w0c@i=6HY}hG2TnKdfN2HV2Ss3l-WbQR+;-@O1~6F;OYst z8etObPsS3Ce%`p$xZJGioAdgcsr=sUyMOh`{@(4Ue-0=6qLQZ3digL~|7ZxUC+v!( nLgGJ=0!4G>k2xuGdl?Pk-L81jh! literal 0 HcmV?d00001 diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore deleted file mode 100644 index 36e75220d..000000000 --- a/ui-tests/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Katalon Studio -Reports/* -Profiles/default.glbl -.classpath -.settings diff --git a/ui-tests/.project b/ui-tests/.project deleted file mode 100644 index 55d9e666d..000000000 --- a/ui-tests/.project +++ /dev/null @@ -1,56 +0,0 @@ - - - OCWA - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.groovy.core.groovyNature - org.eclipse.jdt.core.javanature - - - - 1544033544591 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1544033544600 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 1544122890560 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1544122890586 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - diff --git a/ui-tests/Include/config/log.properties b/ui-tests/Include/config/log.properties deleted file mode 100644 index 8142b1dc2..000000000 --- a/ui-tests/Include/config/log.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file is used to configure Katalon Studio execution log levels. - -# When you need to troubleshoot Katalon Studio issue -# logging.level.com.kms=TRACE - -# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature b/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature deleted file mode 100644 index 263130bd7..000000000 --- a/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: export discussion and status log of a request -As an administrator I need the ability to export a discussion / status log to a pdf file upon request approval so that I have a file-based log of the conversation independent of the database - - Scenario: generate an export log of a newly approved request - Given a request has a status of "Review in Progress" - When an output checker approves the request - Then a pdf file should be generates that chronologically lists the discussion about the request as well as status changes \ No newline at end of file diff --git a/ui-tests/Include/features/administator/manual_output_checking_component.feature b/ui-tests/Include/features/administator/manual_output_checking_component.feature deleted file mode 100644 index 62c5aa0c6..000000000 --- a/ui-tests/Include/features/administator/manual_output_checking_component.feature +++ /dev/null @@ -1,19 +0,0 @@ -Feature: Enable / Disable manual output checker component -As an administrator I need the ability to disable the manual output checker components so that stakeholders that do not have a manual output checking step in their export process can still utilize the application - - Scenario: Manual output checking component turned off and passes all policy tests - Given the manual output checking component has been marked as disabled - And the request passes all policy tests - When a request is submitted - Then the request status should be "Approved" - - Scenario: Manual output checking component turned off and fails a policy test - Given the manual output checking component has been marked as disabled - And the request fails at least one policy test - When a request is submitted - Then the request status should be "Work in progress" - - Scenario: Manual output checking component is turned on - Given the manual output checking component has been marked as enabled - When a request is submitted - Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui-tests/Include/features/administator/team_sharing_component.feature b/ui-tests/Include/features/administator/team_sharing_component.feature deleted file mode 100644 index 328d41da8..000000000 --- a/ui-tests/Include/features/administator/team_sharing_component.feature +++ /dev/null @@ -1,22 +0,0 @@ -Feature: team sharing of requests -As an administrator I need the ability to enable / disable the ability for requesters to view / edit their team member's request on a per project basis so that multiple types of project sharing models can be accommodated - - Scenario outline: Team sharing enabled - Given team sharing has been marked as enabled - And requester A is logged in - And requester B on the same project exists - And requester B has a request - When requester A views team's requests - Then requester B's request status should be visible - Example: - | status | - | Draft | - | Awaiting review | - | Review in progress | - | Approved | - | Work in progress | - | Archived | - Scenario: Team sharing disabled - Given team sharing has been marked as disabled - When a request is submitted - Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/adjudicate request.feature b/ui-tests/Include/features/output_checker/adjudicate request.feature deleted file mode 100644 index aa0da9e64..000000000 --- a/ui-tests/Include/features/output_checker/adjudicate request.feature +++ /dev/null @@ -1,17 +0,0 @@ -Feature: Adjudicate request -As an output checker I need the ability to change the status of a request to "Revisions required" so that I can allow the requester to tweak their request without having deny the request and forcing the requester to create a new request -As an output checker I need the ability to change the status of a request to "Approved" so that I can allow the requester to take their outputs out of the SRE - - Scenario: Request is worthy of approval - Given A request exists that is in "Review in Progress" - And the output checker is assigned to the request - When the output checker marks the request as approved - Then the output checker should see the status of the request updated to "Approved" - And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request - - Scenario: Request is needs revisions - Given A request exists that is in "Review in Progress" - And the output checker is assigned to the request - When the output checker marks the request as needs revisions - Then the output checker should see the status of the request updated to "Work in progress" - And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/claim_request.feature b/ui-tests/Include/features/output_checker/claim_request.feature deleted file mode 100644 index 371010dd3..000000000 --- a/ui-tests/Include/features/output_checker/claim_request.feature +++ /dev/null @@ -1,14 +0,0 @@ -Feature: Claim a request -As an output checker I need the ability to claim a request so that I can let my fellow output checker know that I'm going to be working on a particular request - -Scenario: Claim an unclaimed request -Given output checker has logged in -When output checker tries to claim an unclaimed request -Then the output checker should be able to see that they're now assigned the request - -Scenario: Claim a request already claimed by another output checker -Given output checker has logged in - And at least on other output checker exists - And the other output checker is assigned to a request -When output checker tries to claim the already assigned request -Then the output checker should be able to see that they're now assigned the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/undo_approval.feature b/ui-tests/Include/features/output_checker/undo_approval.feature deleted file mode 100644 index d82687a8f..000000000 --- a/ui-tests/Include/features/output_checker/undo_approval.feature +++ /dev/null @@ -1,9 +0,0 @@ -Feature: Undo request approval -As an output checker I need the ability to undo a request approval so that I can appropriately update requests to fix requests that were accidently approved or need to be made unavailable to an requester - -Scenario: Undo an approved request -Given output checker has logged in - And at least one approved request exists -When output checker submits an approved request to undo -Then the output checker should see that the request is now has a status of "Work in progress" -And the status of "Accepted" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature b/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature deleted file mode 100644 index 0300a9ed3..000000000 --- a/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature +++ /dev/null @@ -1,12 +0,0 @@ -Feature: See a list of all output checking requests -As an output checker I need the ability to see all requests so that I can quickly see what is in the queue - -Scenario Outline: View requests - Given output checker has logged in - When output checker selects a filter - Then the output checker should only see requests of type - Examples: - | filter | filter_condition | - | My requests | requests claimed by the output checker | - | Unassigned | requests not claimed by an output checker | - | All | all requests | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature b/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature deleted file mode 100644 index f4951feff..000000000 --- a/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: Access approved output files outside of the secure environment -As an requester I want to be able to access approved output files outside of the secure environment so that I can share my results with others - Scenario: Access approved request outside of the SRE - Given requester has logged in (outside of SRE) - And requester has an approved request - When requester views their request's approved files - Then requester can copy their approved files to their local computer \ No newline at end of file diff --git a/ui-tests/Include/features/requester/canceling_request.feature b/ui-tests/Include/features/requester/canceling_request.feature deleted file mode 100644 index a54c7dbbb..000000000 --- a/ui-tests/Include/features/requester/canceling_request.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: Canceling a request -As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed - Scenario: Cancel a request - Given requester has logged in - And requester has a request that is "Awaiting review" or "Review in progress" - When the requester cancels the request - Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui-tests/Include/features/requester/create_a_new_request.feature b/ui-tests/Include/features/requester/create_a_new_request.feature deleted file mode 100644 index a44ea1746..000000000 --- a/ui-tests/Include/features/requester/create_a_new_request.feature +++ /dev/null @@ -1,39 +0,0 @@ -Feature: create a new request - As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment - Background: - Given requester has logged in - And requester initiates a new request - And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of the authorized user�s knowledge - Scenario: A valid request - Given the export files do not violate any blocking rules - When requester submits their request - Then the requester's request is put in awaiting review - Scenario: A request has no data - Given requester does not provide any data they wish to export - When requester submits their request - Then the requester should not be able to submit the request - - Scenario Outline: A request violates blocking rule - Given a request violates blocking rule: - When requester submits their request - Then requester should not be able to submit the request - And the requester should be informed that has been violated - - Examples: - | blocking_rule | - | A request that has a file that is too big | - | The summation of all export file sizes exceeds the request file size limit | - | An export file has a blocked file extension | - | A request has a file with a StudyID in it | - - Scenario Outline: A request violates warning rule - Given a request violates blocking rule: - When requester submits their request - Then requester should be able to submit the request - And the requester should be informed that has been violated - - Examples: - | warning_rule | - | A request that has a file that exceeds the file size warning threshold | - | The summation of all export file sizes exceeds the request file size warning threshold | - | An export file has a warning file extension | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/draft_requests.feature b/ui-tests/Include/features/requester/draft_requests.feature deleted file mode 100644 index cbe142827..000000000 --- a/ui-tests/Include/features/requester/draft_requests.feature +++ /dev/null @@ -1,16 +0,0 @@ -Feature: Draft requests -As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once - Background: - Given requester has logged in - Scenario: Save a draft request (no files) - And requester has started a request - But has not submitted the request - When the requester saves their request - Then the requester should be able to re-open the request and pick up where they left off - - Scenario: Save a draft request (with files) - And requester has started a request - And requester add output files to the request - But has not submitted the request - When the requester saves their request - Then the requester should be able to re-open the request and pick up where they left off \ No newline at end of file diff --git a/ui-tests/Include/features/requester/edit_previously_submitted_request.feature b/ui-tests/Include/features/requester/edit_previously_submitted_request.feature deleted file mode 100644 index 05dcde51b..000000000 --- a/ui-tests/Include/features/requester/edit_previously_submitted_request.feature +++ /dev/null @@ -1,8 +0,0 @@ -Feature: edit a previously submitted request -As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request - Scenario: Edit a request that has been reviewed by an output checker and needs revisions - Given requester has logged in - And requester the request is "Work in Progress" - When the requester views the request - Then the requester should be able to make changes to the request - And re-submit the request \ No newline at end of file diff --git a/ui-tests/Include/features/requester/notifications.feature b/ui-tests/Include/features/requester/notifications.feature deleted file mode 100644 index 086673c6a..000000000 --- a/ui-tests/Include/features/requester/notifications.feature +++ /dev/null @@ -1,23 +0,0 @@ -Feature: Notifications -As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action - - Scenario Outline: requester notifications - Given an requester has created or modified a request - When occurs - Then the requester should receive an email notifying them of the - But the email should not contain specifics of the request - Examples: - | event | - | output checker makes a comment on the request | - | output checker approves the request | - | output checker requests revisions the request | - - Scenario Outline: output checker notifications - Given an output checker has currently claimed a request - When occurs - Then the output checker should receive an email notifying them of the - But the email should not contain specifics of the request - Examples: - | event | - | requester makes a comment on the request | - | requester re-submits a request | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/request_discussion.feature b/ui-tests/Include/features/requester/request_discussion.feature deleted file mode 100644 index f6aff55b7..000000000 --- a/ui-tests/Include/features/requester/request_discussion.feature +++ /dev/null @@ -1,15 +0,0 @@ -Feature: Discussion about a request - As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request - As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request - Scenario: requester adds a new comment about request - Given requester has logged in - And requester has a submitted request - And the request has been claimed by an output checker - When requester writes and submits a new comment - Then the requester should see their new comment displayed - And the output checker assigned to the request should be notified of the new comment - Scenario: Output checker adds a new comment about request - Given output checker has logged in - When output checker writes and submits a new comment - Then the output checker should see their new comment displayed - And the requester(s) associated to the request should be notified of the new comment \ No newline at end of file diff --git a/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature b/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature deleted file mode 100644 index 7e42638e3..000000000 --- a/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature +++ /dev/null @@ -1,15 +0,0 @@ -Feature: seeing / editing project team members requests -As an requester I need the ability to see / edit my team member's requests so that I can more easily collaborate with my fellow team members - Background: - Given requester has logged in - And the requester is a member of a project team - And another project team member has created a request - And the project has team sharing enabled - Scenario: View / edit a team member's request in a project that allows editing of team member's requests - Given the requester's project allows for editing of team member's requests - When the requester views their requests - Then the team member's request should be visible and editable - Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests - Given the requester's project does not allow for editing of team member's requests - When the requester views their requests - Then the team member's request should not be visible or editable \ No newline at end of file diff --git a/ui-tests/Include/features/requester/see_requests_by_status.feature b/ui-tests/Include/features/requester/see_requests_by_status.feature deleted file mode 100644 index 14c8c5bc5..000000000 --- a/ui-tests/Include/features/requester/see_requests_by_status.feature +++ /dev/null @@ -1,18 +0,0 @@ -Feature: See requester's requests by status -As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review - Scenario Outline: View requests - Given requester has logged in - And the requester has an request - And request was last updated within the last month - When requester views requests - Then requests should be displayed - But requests with updates older than a month should not be displayed - - Examples: - | status | filter | - | Approved | Approved | - | Revisions required | Draft | - | Awaiting review | Submitted | - | Review in progress | Submitted | - | Draft | Draft | - | Work in progress | Draft | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/view_request_details.feature b/ui-tests/Include/features/requester/view_request_details.feature deleted file mode 100644 index d7ad2b06b..000000000 --- a/ui-tests/Include/features/requester/view_request_details.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: View request details -As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions - Scenario: View details of a request - Given requester has logged in - And the requester has submitted a request - When the requester views the request - Then the requester should see the complete record of the request (including export files, supporting files/text, discussion, and status changes) \ No newline at end of file diff --git a/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy b/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy deleted file mode 100644 index 4ae4db5f1..000000000 --- a/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy +++ /dev/null @@ -1,26 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.annotation.Keyword -import com.kms.katalon.core.checkpoint.Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling -import com.kms.katalon.core.testcase.TestCase -import com.kms.katalon.core.testdata.TestData -import com.kms.katalon.core.testobject.TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI - -import internal.GlobalVariable - -import org.junit.runner.RunWith -import cucumber.api.CucumberOptions -import cucumber.api.junit.Cucumber -import com.kms.katalon.core.cucumber.keyword.CucumberRunnerResult - -@RunWith(Cucumber.class) -@CucumberOptions(features = "Include/features/requester/draft_requests.feature", glue = "") -public class MyCucumberRunner {} \ No newline at end of file diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy deleted file mode 100644 index eeaf81f58..000000000 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy +++ /dev/null @@ -1,100 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as MobileBuiltInKeywords -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WSBuiltInKeywords -import com.kms.katalon.core.webui.driver.DriverFactory as DriverFactory -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - -import org.openqa.selenium.firefox.FirefoxDriver -import org.openqa.selenium.WebDriver -import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium - -import cucumber.api.java.en.Given -import cucumber.api.java.en.Then -import cucumber.api.java.en.When - -import static org.junit.Assert.* -import java.util.regex.Pattern -import static org.apache.commons.lang3.StringUtils.join - - - -public class Requester_step_def_kr { - - WebDriverBackedSelenium selenium - String request_name - - @Given("yrequester has logged in") - def requester_login() { - - WebUI.openBrowser('') - def driver = DriverFactory.getWebDriver() - String baseUrl = GlobalVariable.OCWA_URL - selenium = new WebDriverBackedSelenium(driver, baseUrl) - selenium.open(GlobalVariable.OCWA_URL) - selenium.click("id=app-auth-login-button") - selenium.type("id=username", "xxx") - selenium.type("id=password", "xxx") - selenium.click("id=kc-login") - } - - @Given("yrequester has started a request") - def requester_starts_new_request() { - WebUI.waitForPageLoad(0) - selenium.click("id=new-request-button") - - request_name = randomString() - selenium.type("id=name", request_name) - } - - @Given("ythe requester has submitted a request") - def requester_submits_a_request() { - requester_starts_new_request() - //requester saves and add files - //requester adds output files - //requester adds supporting files - //requester add supporting text - //requester submits request for review - } - - @Given("yrequester add output files to the request") - def requester_adds_output_files() { - // selenium.click("id=request-form-save-files-button") - // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") - } - - - @Given("yhas not submitted the request") - def requester_has_not_submitted_new_request() { - } - - @When("ythe requester saves their request") - def requester_saves_new_request() { - selenium.click("id=request-form-save-close-button") - } - - @Then("ythe requester should be able to re-open the request and pick up where they left off") - def confirm_draft_save_was_successful() { - WebUI.waitForPageLoad(0) - WebUI.verifyTextPresent(request_name, false) - } - - def randomString() { - Date today = new Date() - String todaysDate = today.format('MMddyy-hhmm') - String engagementName = 'auto_eng ' + todaysDate - return engagementName - } -} diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy deleted file mode 100644 index 5f5053221..000000000 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ /dev/null @@ -1,156 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.annotation.Keyword -import com.kms.katalon.core.checkpoint.Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords -import com.kms.katalon.core.model.FailureHandling -import com.kms.katalon.core.testcase.TestCase -import com.kms.katalon.core.testcase.TestCaseFactory -import com.kms.katalon.core.testdata.TestData -import com.kms.katalon.core.testdata.TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository -import com.kms.katalon.core.testobject.TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords - -import internal.GlobalVariable - -import MobileBuiltInKeywords as Mobile -import WSBuiltInKeywords as WS -import WebUiBuiltInKeywords as WebUI - -import org.openqa.selenium.WebElement -import org.openqa.selenium.WebDriver -import org.openqa.selenium.By - -import com.kms.katalon.core.mobile.keyword.internal.MobileDriverFactory -import com.kms.katalon.core.webui.driver.DriverFactory - -import com.kms.katalon.core.testobject.RequestObject -import com.kms.katalon.core.testobject.ResponseObject -import com.kms.katalon.core.testobject.ConditionType -import com.kms.katalon.core.testobject.TestObjectProperty - -import com.kms.katalon.core.mobile.helper.MobileElementCommonHelper -import com.kms.katalon.core.util.KeywordUtil - -import com.kms.katalon.core.webui.exception.WebElementNotFoundException - -import cucumber.api.java.en.And -import cucumber.api.java.en.Given -import cucumber.api.java.en.Then -import cucumber.api.java.en.When - - -class Requester_step_def_ks { - String request_name = '' - TestObject newRequestButtonObject = null - TestObject requestFormSaveCloseButtonObject = null - - /** - * The step definitions below match with Katalon sample Gherkin steps - */ - @Given("requester has logged in") - def requester_login() { - WebUI.openBrowser('') - WebUI.delay(5) - WebUI.closeBrowser() - - //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) - - //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - - //WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - - //WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) - } - - @Given("requester has started a request") - def requester_starts_new_request() { - - //newRequestButtonObject = new TestObject("new-request-button") - //newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - - //WebUI.waitForPageLoad(30) - - //WebUI.waitForElementClickable(newRequestButtonObject, 30) - //WebUI.click(newRequestButtonObject) - //request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() - //WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) - } - - @Given("has not submitted the request") - def requester_has_not_submitted_new_request() { - } - - @Given("requester add output files to the request") - def requester_adds_output_files() { - // selenium.click("id=request-form-save-files-button") - // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") - } - - @Given("the output files do not violate any blocking rules") - def output_files_do_not_violate_blocking_rules(){} - - @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") - def requester_affirms_output_is_safe() { - } - - @Given("requester has a submitted request") - def request_has_submitted_a_request(){ - requester_starts_new_request() - requester_adds_output_files() - requester_submits_request() - } - - @Given("the request has been claimed by an output checker") - def request_has_been_claimed_by_a_oc(){} - - @When("the requester saves their request") - def requester_saves_new_request() { - //requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - //requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - //WebUI.click(requestFormSaveCloseButtonObject) - } - - @When("requester submits their request") - def requester_submits_request() { - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) - } - - @When("requester writes and submits a new comment") - def requester_creates_a_new_comment(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Smcuk')) - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) - - //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) - - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') - } - - @Then("the requester should be able to re-open the request and pick up where they left off") - def confirm_draft_save_was_successful() { - //WebUI.waitForPageLoad(0) - //WebUI.verifyTextPresent(request_name, false) - } - - @Then("the requester's request is put in awaiting review") - def confirm_request_is_in_awaiting_review_state(){ - WebUI.verifyTextPresent("Awaiting review", false) - } - - @Then("the requester should not be able to submit the request") - def requester_is_not_able_to_submit_request(){ - WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) - } -} \ No newline at end of file diff --git a/ui-tests/LICENSE b/ui-tests/LICENSE deleted file mode 100644 index 261eeb9e9..000000000 --- a/ui-tests/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/ui-tests/Libs/CustomKeywords.groovy b/ui-tests/Libs/CustomKeywords.groovy deleted file mode 100644 index 9457decb7..000000000 --- a/ui-tests/Libs/CustomKeywords.groovy +++ /dev/null @@ -1,9 +0,0 @@ - -/** - * This class is generated automatically by Katalon Studio and should not be modified or deleted. - */ - - -def static "test_OCWA_keywords.random_test_request_name.gen_random_test_request_name"() { - (new test_OCWA_keywords.random_test_request_name()).gen_random_test_request_name() -} diff --git a/ui-tests/Libs/internal/GlobalVariable.groovy b/ui-tests/Libs/internal/GlobalVariable.groovy deleted file mode 100644 index 51b9af8e5..000000000 --- a/ui-tests/Libs/internal/GlobalVariable.groovy +++ /dev/null @@ -1,33 +0,0 @@ -package internal - -import com.kms.katalon.core.configuration.RunConfiguration -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase - -/** - * This class is generated automatically by Katalon Studio and should not be modified or deleted. - */ -public class GlobalVariable { - - /** - *

- */ - public static Object OCWA_URL - - - static { - def allVariables = [:] - allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca']) - allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) - - String profileName = RunConfiguration.getExecutionProfile() - - def selectedVariables = allVariables[profileName] - OCWA_URL = selectedVariables['OCWA_URL'] - - } -} diff --git a/ui-tests/OCWA.prj b/ui-tests/OCWA.prj deleted file mode 100644 index b72b1c47e..000000000 --- a/ui-tests/OCWA.prj +++ /dev/null @@ -1,28 +0,0 @@ - - - - OCWA - - c5e0fe7e-c962-4704-a11f-3f2a0dde36b0 - 5.9.0 - 0 - - - - Include/scripts/groovy - - - - - Include/scripts/groovy - - - Include/features - - - Include/config - - - - GENERIC - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs b/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs deleted file mode 100644 index d8b91480a..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - a_OCWA Export Tool - - 25096df1-9278-4593-ba26-96d3644e62fb - - - XPATH - //div[@id='main']/div/div/main/div/a - - - XPATH - false - - true - equals - tag - Main - a - - - false - equals - class - Main - src-components-app-bar-styles_brand--2yq_z3-4 - - - true - equals - href - Main - / - - - true - equals - text - Main - OCWA Export Tool - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-components-app-bar-styles_container--1ufsCzTM"]/a[@class="src-components-app-bar-styles_brand--2yq_z3-4"] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div/a - - - false - equals - xpath:link - //a[contains(text(),'OCWA Export Tool')] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/preceding::a[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='gfggggg'])[1]/preceding::a[1] - - - false - equals - xpath:href - //a[contains(@href, '/')] - - - false - equals - xpath:position - //a - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs b/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs deleted file mode 100644 index e3e500cf5..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs +++ /dev/null @@ -1,97 +0,0 @@ - - - - button_All - - 57c6c6d1-9295-45c9-a94f-4e2707f2030b - - - XPATH - (//button[@type='button'])[2] - - - BASIC - //button[@type = 'button' and (text() = 'All' or . = 'All')] - - - BASIC - false - - true - equals - tag - Main - button - - - false - equals - class - Main - sc-ifAKCX eiXwJb - - - false - equals - spacing - Main - default - - - true - equals - type - Main - button - - - true - equals - text - Main - All - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"] - - - true - equals - xpath:attributes - (//button[@type='button'])[2] - - - false - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::button[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::button[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::button[1] - - - false - equals - xpath:position - //nav/div/div/button - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs deleted file mode 100644 index 7fdfa747c..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs +++ /dev/null @@ -1,67 +0,0 @@ - - - - div_My RequestsAllDraftQueuedI - - 0fbd49b5-aff6-4db6-a4fe-1ca40e30216a - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2] - - - XPATH - false - - true - equals - tag - Main - div - - - false - equals - class - Main - sc-jTzLTM gBDbcZ - - - true - equals - text - Main - My RequestsAllDraftQueued/In ReviewFlaggedDeniedCancelledStatusRequest IdentifierSubmitted OnUpdated OnOutput CheckergfgggggDec 5th, 2018Dec 5th, 2018-Actions - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::div[17] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::div[18] - - - false - equals - xpath:position - //div[2]/div/div/div[2] - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs deleted file mode 100644 index ba14bcb03..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs +++ /dev/null @@ -1,66 +0,0 @@ - - - - div_Request Name_Content-ve26f - - 7c1d1122-bf34-4010-91ca-3e08c1ecd1b7 - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::div[3] - - - XPATH - false - - true - equals - tag - Main - div - - - false - equals - class - Main - Content-ve26fj-1 kmGRCO - - - true - equals - xpath - Main - /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-clBsIJ daqMjj"]/div[@class="Form__FormWrapper-sc-11btfyj-0 fTWjSn"]/form[1]/div[@class="Field__FieldWrapper-vqybw1-0 doxtck"]/div[@class="FieldTextStateless__Wrapper-ynbdsh-0 gIJAym"]/div[@class="Content__ContentWrapper-ve26fj-2 feWTNh"]/div[@class="Content__ChildWrapper-ve26fj-0 ilJUcG"]/div[@class="Content-ve26fj-1 kmGRCO"] - - - true - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::div[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::div[5] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='This field is required'])[1]/preceding::div[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::div[2] - - - false - equals - xpath:position - //form/div/div/div/div/div - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs deleted file mode 100644 index 66899c38a..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs +++ /dev/null @@ -1,73 +0,0 @@ - - - - div_You have no requests - - b89ed3fb-0198-49dd-8259-f0813e8d1488 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div[2] - - - XPATH - false - - true - equals - tag - Main - div - - - false - equals - class - Main - LoadingContainer__Container-kdx72l-0 cnWOuY - - - true - equals - text - Main - You have no requests! - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainer__Container-kdx72l-0 cnWOuY"] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Output Checker'])[1]/following::div[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Updated On'])[1]/following::div[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Flag notifications'])[1]/preceding::div[7] - - - false - equals - xpath:position - //div[2]/div/div/div/div/div[2] - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs b/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs deleted file mode 100644 index d8959732d..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - h1_gfggggg - - a1fc170f-0b98-4d7d-b215-a30c8ce55c48 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/h1 - - - XPATH - false - - true - equals - tag - Main - h1 - - - true - equals - text - Main - gfggggg - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-request-styles_header--3R28zHQp"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG bLOLTU"]/div[1]/h1[1] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/h1 - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::h1[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::h1[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::h1[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Details'])[1]/preceding::h1[1] - - - false - equals - xpath:position - //h1 - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs deleted file mode 100644 index f57f705e9..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - span_All - - e46b1338-cfb4-4490-afcb-c261879f15a8 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button/span/span - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - All - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX kcQtWv"]/span[1]/span[1] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::span[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[3] - - - false - equals - xpath:position - //nav/div/div/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs deleted file mode 100644 index 68d4bcaab..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - span_Cancel (1) - - 302d13ea-63d3-429f-8017-1c0869660067 - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Cancel - - - false - equals - xpath - Main - id("request-form-cancel-button")/span[1]/span[1] - - - true - equals - xpath:idRelative - //button[@id='request-form-cancel-button']/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div/div/div[3]/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs deleted file mode 100644 index 5cd570307..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - span_Cancel - - d24922ab-3227-4de2-a025-9b61de62c54f - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Cancel - - - false - equals - xpath - Main - id("request-form-cancel-button")/span[1]/span[1] - - - true - equals - xpath:idRelative - //button[@id='request-form-cancel-button']/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div/div/div[3]/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs deleted file mode 100644 index 35d936862..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - span_Draft - - 5e1ee825-c4ed-4fe3-aad4-e969480d9cb0 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div[2]/button/span/span - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Draft - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div[2]/button/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/following::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div[2]/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs deleted file mode 100644 index f04ad3bb2..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs +++ /dev/null @@ -1,54 +0,0 @@ - - - - span_Login (1) - - 736cb464-f5e1-49ac-b997-9d69349bde84 - - - XPATH - //span/span - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Login - - - false - equals - xpath - Main - id("app-auth-login-button")/span[1]/span[1] - - - true - equals - xpath:idRelative - //a[@id='app-auth-login-button']/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] - - - false - equals - xpath:position - //span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs deleted file mode 100644 index 512ee9e88..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs +++ /dev/null @@ -1,83 +0,0 @@ - - - - span_New Request - - 67319848-cfcb-40e6-8718-6ed1d88c2501 - - - XPATH - //div[@id='main']/div/div/main/div/div/button/span/span[2] - - - BASIC - id("new-request-button")/span[1]/span[2][count(. | //span[(text() = 'New Request' or . = 'New Request') and @id = 'new-request-button']) = count(//span[(text() = 'New Request' or . = 'New Request') and @id = 'new-request-button'])] - - - BASIC - false - - true - equals - tag - Main - span - - - true - equals - text - Main - New Request - - - true - equals - xpath - Main - id("new-request-button")/span[1]/span[2] - - - true - equals - id - Main - new-request-button - - - true - equals - xpath:idRelative - //button[@id='new-request-button']/span/span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] - - - false - equals - xpath:position - //span[2] - - - false - equals - xpath:idRelative - //div[@id='main']/div/div/main/div/div/button/span/span[2] - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs deleted file mode 100644 index c0e3b9127..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs +++ /dev/null @@ -1,74 +0,0 @@ - - - - span_Save Close (1) - - fcb168c3-906b-48cc-8c0d-63697e3b1f15 - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] - - - BASIC - //span[(text() = 'Save & Close' or . = 'Save & Close')] - - - CSS - - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Save & Close - - - false - equals - xpath - Main - /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-eMRERa dFsmTH sc-fgrSAo gdmBOU"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] - - - true - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[5] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div[2]/div/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs deleted file mode 100644 index 5953f01aa..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs +++ /dev/null @@ -1,70 +0,0 @@ - - - - span_Save Close - - 571126cb-8d91-45cd-a433-0545e72d0e97 - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] - - - BASIC - //span[(text() = 'Save & Close' or . = 'Save & Close')] - - - BASIC - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Save & Close - - - false - equals - xpath - Main - /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-eMRERa dFsmTH sc-fgrSAo gdmBOU"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] - - - true - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[5] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div[2]/div/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs b/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs deleted file mode 100644 index 758eef0e2..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs +++ /dev/null @@ -1,67 +0,0 @@ - - - - table_StatusRequest Identifier - - 66325af3-ebf7-4813-ae5d-9f1d250d8835 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table - - - XPATH - false - - true - equals - tag - Main - table - - - false - equals - class - Main - DynamicTable__Table-sc-1naczgt-0 cFUPVR - - - true - equals - text - Main - StatusRequest IdentifierSubmitted OnUpdated OnOutput CheckergfgggggDec 5th, 2018Dec 5th, 2018-Actions - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainerAdvanced__Container-sc-1s2zdt8-0 cFyKDm"]/table[@class="DynamicTable__Table-sc-1naczgt-0 cFUPVR"] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Cancelled'])[1]/following::table[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/following::table[1] - - - false - equals - xpath:position - //table - - diff --git a/ui-tests/Profiles/Travis.glbl b/ui-tests/Profiles/Travis.glbl deleted file mode 100644 index feb3f8808..000000000 --- a/ui-tests/Profiles/Travis.glbl +++ /dev/null @@ -1,12 +0,0 @@ - - - - Travis - - false - - - 'http://localhost:8000' - OCWA_URL - - diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy deleted file mode 100644 index 9abd4b88e..000000000 --- a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy +++ /dev/null @@ -1,28 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - - - -//cucumberRunnerClass c = new MyCucumberRunner() - -//CucumberRunnerResult c1 = -CucumberKW.runWithCucumberRunner(MyCucumberRunner.class) - - -//CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') -//CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature', FailureHandling.STOP_ON_FAILURE) -//CucumberRunnerResult c1 = CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') -//CucumberKW.runFeatureFolder('Include/features/requester') -//println "Status" + c1.getStatus().toString() \ No newline at end of file diff --git a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy deleted file mode 100644 index 33d71f778..000000000 --- a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy +++ /dev/null @@ -1,23 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - -WebUI.openBrowser('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') - -//WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - -WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) - -WebUI.closeBrowser() - diff --git a/ui-tests/Test Cases/Requester/Run cucumber tests.tc b/ui-tests/Test Cases/Requester/Run cucumber tests.tc deleted file mode 100644 index 800064d70..000000000 --- a/ui-tests/Test Cases/Requester/Run cucumber tests.tc +++ /dev/null @@ -1,8 +0,0 @@ - - - - Run cucumber tests - - - 76fac551-a5e8-47b3-ad4d-73ca4acc6659 - diff --git a/ui-tests/Test Cases/Requester/test_case_testing.tc b/ui-tests/Test Cases/Requester/test_case_testing.tc deleted file mode 100644 index a2198ee2c..000000000 --- a/ui-tests/Test Cases/Requester/test_case_testing.tc +++ /dev/null @@ -1,8 +0,0 @@ - - - - test_case_testing - - - 2e88f452-f251-4bbb-b9a2-876eb3eecea1 - diff --git a/ui-tests/Test Suites/Run OCWA test cases.groovy b/ui-tests/Test Suites/Run OCWA test cases.groovy deleted file mode 100644 index 49ab4777d..000000000 --- a/ui-tests/Test Suites/Run OCWA test cases.groovy +++ /dev/null @@ -1,66 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject - -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile - -import internal.GlobalVariable as GlobalVariable - -import com.kms.katalon.core.annotation.SetUp -import com.kms.katalon.core.annotation.SetupTestCase -import com.kms.katalon.core.annotation.TearDown -import com.kms.katalon.core.annotation.TearDownTestCase - -/** - * Some methods below are samples for using SetUp/TearDown in a test suite. - */ - -/** - * Setup test suite environment. - */ -@SetUp(skipped = true) // Please change skipped to be false to activate this method. -def setUp() { - // Put your code here. -} - -/** - * Clean test suites environment. - */ -@TearDown(skipped = true) // Please change skipped to be false to activate this method. -def tearDown() { - // Put your code here. -} - -/** - * Run before each test case starts. - */ -@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. -def setupTestCase() { - // Put your code here. -} - -/** - * Run after each test case ends. - */ -@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. -def tearDownTestCase() { - // Put your code here. -} - -/** - * References: - * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ - */ \ No newline at end of file diff --git a/ui-tests/Test Suites/Run OCWA test cases.ts b/ui-tests/Test Suites/Run OCWA test cases.ts deleted file mode 100644 index 41a580f83..000000000 --- a/ui-tests/Test Suites/Run OCWA test cases.ts +++ /dev/null @@ -1,20 +0,0 @@ - - - - Run OCWA test cases - - false - 2018-12-11T13:49:04 - - 0 - 30 - true - false - b535506e-7ead-48e8-b30a-3efef1a51e0f - - 09de8a8b-040a-4a5d-a823-53625b8804a5 - false - true - Test Cases/Requester/Run cucumber tests - - diff --git a/ui-tests/Test Suites/TestingTestSuite.groovy b/ui-tests/Test Suites/TestingTestSuite.groovy deleted file mode 100644 index 49ab4777d..000000000 --- a/ui-tests/Test Suites/TestingTestSuite.groovy +++ /dev/null @@ -1,66 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject - -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile - -import internal.GlobalVariable as GlobalVariable - -import com.kms.katalon.core.annotation.SetUp -import com.kms.katalon.core.annotation.SetupTestCase -import com.kms.katalon.core.annotation.TearDown -import com.kms.katalon.core.annotation.TearDownTestCase - -/** - * Some methods below are samples for using SetUp/TearDown in a test suite. - */ - -/** - * Setup test suite environment. - */ -@SetUp(skipped = true) // Please change skipped to be false to activate this method. -def setUp() { - // Put your code here. -} - -/** - * Clean test suites environment. - */ -@TearDown(skipped = true) // Please change skipped to be false to activate this method. -def tearDown() { - // Put your code here. -} - -/** - * Run before each test case starts. - */ -@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. -def setupTestCase() { - // Put your code here. -} - -/** - * Run after each test case ends. - */ -@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. -def tearDownTestCase() { - // Put your code here. -} - -/** - * References: - * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ - */ \ No newline at end of file diff --git a/ui-tests/Test Suites/TestingTestSuite.ts b/ui-tests/Test Suites/TestingTestSuite.ts deleted file mode 100644 index cfaf2f9db..000000000 --- a/ui-tests/Test Suites/TestingTestSuite.ts +++ /dev/null @@ -1,20 +0,0 @@ - - - - TestingTestSuite - - false - 2018-12-14T09:32:19 - - 0 - 30 - true - false - 37beaa13-ec79-424e-aaa5-703cc753aa44 - - c0b18a0a-46ce-4d12-a377-bd30fe71c1b1 - false - true - Test Cases/Requester/test_case_testing - - diff --git a/ui-tests/bin/groovy/Requester_step_def_kr.class b/ui-tests/bin/groovy/Requester_step_def_kr.class deleted file mode 100644 index a2f422bbd2e87f2019711b1a50b0e033bc47c755..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6547 zcmbtY349dQ8UJ3g$!<0SBm)E@sH>(DHd$9zt4KtFC=f}2l7tAfT_?M<*&(|#ab`AQ zd#JV8YOSqpZEbDU)~eLjwup#{SLvnJUiPr}ec$(e*#5tn+0AUSLH$8~yq)>pcVF*& z^VG8sJw`;U#EF6y?@%u6;J9)UKJ$wPHWq5o0>iXoTfI*R%|WRol`8U zN6#37qP>PW5>FXvHLDb?xMz&1W^yo4GxT^F7xcko5*+%v1&Q5)8uF^GINO4j^!nY< zSK0tg{rQ@%*%t_^ZC|-lBAFJ3DL{(^HMfnZcDItt^=r1e-ZYh>phWx1J=GN|=(d(u z<0;@k**yCiC%C1I+erGgeR%YMhivI>G)+gHw^okS^C09VK zmKMtlBU#0Yfa!>uj%a!h4slwqoz6a_6lsuqzfX-R4{tdO$&u8STQsLBCKU9tz73qrpyhq#hK*2)h^uP0;B&+cJV$+I#%o z^N`R{4H^rRPM0&IMx2T812l+v?8|<#C7MqQ*uCR|&Nx=UOQB{FW=2V=tAn%;ojI*p zT$E|_Y(1@*X)O;xucvc00O`w!phX>lc8#p(GP ziNe&#dcT&>O^7z~Zly_d4V}gZ!s}SzJUEL@cfx<2pk=&kgk1y?1VwvtA{9xK?%jFwYz3PpXv#&*QrjX1jz+lcsN3R*F( zAkLAbZrI7P29-HD&y*m6kJyQU>nLh=h~?=JYg{dX0Mqg|FC-( z2s#DsEoD{4F!M1+jiqvirIxeooj^+&dPXzz$+W3tU=xs%6EM&!q*AJ7WeO;oIaC^O zRT`M766UO2Ix?(AIRDs@rW(Uxp!>ZLL1sk8wA5&%Fcz7}swNP#YB7>iGj_ztWY~x% zUYaY4ZG&OtR7DTc?ObBJ{UzpYIVJYKFuj-VU~*Z|e5Y0mww8-uq}Vv6?vkj-J(CVF z%0lFRUtc<1EXK0gd_F`UWGJSn2J|l@sp=z<5PcXUg>9sHkZN)pc9|ijjj*$2F?+}Z zg)*Y%QAb;yc`?Mp7>|XRqAG?Nx64X&KON@5?Eyjac%buDYDbkeJ@>@*AWd>>o{~tS zd0c}J3u>?0JF3i}L3$JwTT<1XVAuM^m(GOe%Mg+H7#$7MWAt&CaoH}3KFPD;WArI( zSgPOP6Ds>onWSswPT*?#xG|~%m^IQf#wYKve_n?vcOi&gTy?Gv(r2IZ-)?8=_y}9=xr4Xnk^UM{kIJ1?|soL&LYc5w-1t5d8+%5#|!2 z-=W8)a_Gq+`U79pFerxTPoSAlG<&0AZbw(^H580te+khwA=-=9jO((NDGsRnkXx#S zmKUObU>f5CN5S*Iz-KI1utM}7+~lg6C+Hj`L)D%#*A>dS&~|Z?UM$g1=%*-Wfjdy* zg)<2X4E`0R;5NCc-o^!6)P+Sr)Jyau`Z4;ez!!(xAYoSc}AxgoK$yG>Ul= zJxl*%g>gbxo)apZS7s?qZQx+yGr$5P)u61b8qukdCFh+5n%; z2yL&Xt6QCGv+9&>R#8p?8gAU&Qgk zA(=q4JWEPRuot4M=iYsCq`JsqA7P!#^_0A?q=7o$O3nskcO6?7)uNUP`$N{D5^ zZG@NF@c%^?$OO;DuEQ{J1n@^xbRCw1!)hnVESX`sDi+-LLo{&(Mqt;%RBP8EgmYl#FOAfJQF`IF{k8wS41JpB<;adQH>v1sLK9k|w!0@Ir z!*wu+HEeOCeX|>mcg;#bHx!Fz={s0v|90?2GQ9&ox0Kmm3X_<9)MbC`jAXhE?;Lp~ z*!$;*e!EX3&t?JIjp*+wi+#5%_C5H)9nxzXx5Fwf`Yo>5I}`HVQ}lrvlJ9oP_im@$ z?@4sZA94)!)%(2(`6DQIvz`>#DF7!$CNQRUM9;YWf0@;&T zAMF4RcTr~eBz?x)Z-u_xb>~6$Q_+sjDf(gnCc0=()0aH7rC#nxF4`1*wYH4)41H}* zX5S3JPyA2Nx9Hm*S~K3*h&re|;K;)3cj&v`c7@6VCGzjl_p6ZaFOmO%eprosziV-r z=L2v5dYHn}uZ+qogv;)b> ze+9&Hp0AMqhUaUY-5cb;eyf9XoBU5e?sPccBmW!E_sak6FDZsOz*Fp0gn|`o z!A diff --git a/ui-tests/bin/groovy/Requester_step_def_ks.class b/ui-tests/bin/groovy/Requester_step_def_ks.class deleted file mode 100644 index 86527bfc8ec96fe1b2b1fec6a80f26e53fab5d8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6842 zcmbtZd0-UP8UJ3g$u7wPVIV*daVb9kJJ@`~ivxj2Htrpqm*t9dC%Nlddy+NP!tZx*yzm*XCluA*%lx=UWr+CnAc%srQcy!$wd_8lZ=wJnpB?o%*>jF>$FbMuR^N^X6Q)(Px`CcU&ka)pHL?b4 z!W4GDS_Lg+b0r=3mCY-tCE8lW@?mPDwQQI6FfAa3>BR*F>=DgkcU6pAxNE)_MaYkw zF|6r=7Jc_Lj*7xP2XjH?AL?m$RAzFixWI_T7msktJ|v7}5dGNM`$&>WVT zh^E&fAqm#1=%H~rRMg_5a$?*tGw}gA)US0FwVb^}?{W8#u;&PBKc2g0MM{t$R)Dt! zZ9Kk{JS8jW9i}aGUL&1L=d%KWml`Ok>4*hg&BeFpj3G6*S2ZJhZb-Hl9d$M>ki zGPS#VpfhrT9FsYtke9k0*(*(p)7~nmdMd#Y5TczXCUg`y1P(?H_N1Q}#BVwe-)wre?igv2sVms$$#4sZ=uWGqe(b)-6Kgv@98Jd$5 zAsP^LQ3WHHTI4CMY>Xu{y&Dm?4X#v2CSDc@n%7-K&(BX6 zzgI9Xr#8G2k#f8;Xv3f*s-DSV*oY@b4AW*4U+C=w=~akAw|%(-$%(6zH@Jl9HT2pB zdNsXn#^mIl2I&nfy28ssLEEdOO4aJ)CVQ_tJVkaP;hhO8L~j(drX0B`bd;2C*eR=9Xta6zX`Q&KY-D`gaIt}$6HC($EY%cl{XM%=@QbI3)h z8YK&(*D<+vO668LFyeH|l|D++j5zpAT{BCPvK1EzTHy)Qp2dXM&T#E%p7F|g`7Q=* z=4CN2O9ZV<8+ukV^QnxfW??7bq{d-1tC&tp%gPqf3#&-i=Sr76M!FHBn9D?lWQ6-0 z+rgCW=xeCc)0T}Ox*`QFJsK$%BI6^{1mK9Ah~#9}ju_c23%8UPjBFtu0(l(8gfnB% zaQjM_-b?rJ!1z8vb9s>T%|2}v(!2UJ^a1)HPgfrb(_EUz)6hXd(TbT>I( zRCjXT;%8qP>z*w^Wcz(|e*+z+BQD{xUSXQ#x$Q7b;lPr9g_lLE%zCYR0jud_#;63H z5d-Ca#)RXg?6az3JTiiHbH#Z+NJmfDSx<&pm>#B&H`2%G6M`CH-YPSaN77$4y_$QB zqTa4g(dwvSdXye#-k$<*79^B{rTkvanbdB}h+8%>Rp5r%kEavfGcA+Q3cuG9RkXl8s#5 zx=dpnb7qLXi!!9EW7;ri^cnqTE=1o)5#vUd>hDd2=!dxaq;sf!A^I^IcUIFg)3yxJ zPcgzkvp#vH9ipG3bK=KVJ#9|lG6_K5{U!W-?rIcn%bTrMpBJKEBSz7MN--Lu-{NMy z_2T}{L^4Fb2gbOn*)S9j^$A18?Da=nOT5jkImxqqH;ct(J4AmLbRl0EocTZHU9_xq zCJMKaPdO)EvvKD%-jE>i!-bHT|I3DVOTA^ch6mhOt)$8!a)KJ<(bVfrS03tdChqG3*t zrn5pUDC+Rifd~(aAf4GD>P09_|DbV&LNm z2+wT`@k;}KJ^uE@9-zgOv@D@4-?=uHx}R389T2o(Q3)G^HZmb!s^K~9K8Si@iypl!5)I(U!HpflkFX8R=7fickmX4$4}>`*o- z%cto1wKUMCbmCW=($%3{Fhv)l6?)q{ob8J`l!UTtih66y2TA9kj}P`b2g)T=bXkB& zUG5z11-CRcpXjQwS>Re(0bo?EDu&ZjQwqp@_G1omPKddPqwV@Qw}20Ay?m#4ke=OpQ3y%?Of}(XLK!u);nVNQB*0k zDOYqTmSY2De_)a(rs&1>tku;Jy=lcHT~jj6wb)=BZ`0NNI&ZTCbbW_%!xY_EL%Z51 z>GenHCdbX~pm(!liUVwlH#w#Ntrd=)W}D-n&m1cdh5_oqOqYNWc2OVgK|uA=1ilX7 zIp7$R48tUEE}NtSzc>U!Y!We>QN52*JzxVgcr3xUVEe8A2f=;E5_}s7zP(KF1~`oi zUcc+KTi9v0R&ZL3opu{LEyhl}z3jAG{Z6~Xbw|u`$82?zK6U4TZGeVg*EH;!DNFed zh=aukk2RO|0Gzmp_Lted$7OqG zQ-B{dy~1$@0GaI?r2qSsnmZ{30X}^25Z#+-dz|L;?j$`hm^e)LwjH4dIjg8i@MP@~ zSOs*v7t<2hZT;Y56gW5#8$>BV5#gN@!b9{C4?*!b*2mfa!&Qa}K1`2z=PeMN-8C1y zKN@RWJ4K&_wjS7{^q2>>6hJI^*ae%SPuG^Ao}kZECHDCMIXofs7wC%~*aG}wCF(e1 z9A5bOBz?&{o+0vz68e|vD;3bACG@Y-*D9e$OXy#(h#o7Uf1@&b%r#g8_im5;J+K4| ze@jf+sC+LOQ#zF&VC_e+W8()euI5o z`5o3Pls{m-TKN;!Yn7+4UgtnwulyC?H#^i0I9RthShqP?w>wyOIFNTaxOXdmPnN_+ z2lvEY2|u&g&C0(Xrki>YcK>;Zo*7hXVh@NK*WV5NKN24JnVy!>Ln81PEx>w2%sC2# gp2ta<6pcL(iTXjH&O0muvHOJL*-(^?7A{_6pD15!5iW&6|d?RCdo# zJKq)R28PaR8uz$jq%~&Qs;y;53aVwD)#nU`M9MJdm8_BDd9`FIo&l53709S&=*k-J z07E2`Aq`_A4D2#PeUaO$LuS~T^1C)xA&^Y%pr&i~5JOG8XHr5VnxY7!nV}^%&+QSl zP)KVwA2v<3%+Me2nF)5Nq}y7ND_P>Vh+nA)4oHx(DT)v_Gi(wn(@uzME-Ux3RJc42n|on`||l>vCp#Vu#ZwHqGUMybQ^9D1smCq z10vYx8IC?JSes(WQ$rUt>ezJNFl`at8Sf;5LkyA|b=o$G=fB~0`KY{);Aj+wLABx= z3NAH*Vw)7M6kF&;BE0Lqorq(cr|^=Sm2~5Z{!}U zLJw^p{?)5cOeiwFC2+(>@EXH8f8d@XpX&7(lQ4tV8<2s@&_M8BFpWiS+Eh%B37IEBYw`R#(m&aaHr*z#}#3Hfrd#;Ob*{> z+ToL+?Wm-UIr|cy<0jX$oZ6~2mNhx`RAnzY3oSzK~4K+P9kER<-Bm1uVaDQ7rH-5FTj)h55=l(R@`Bp6r}h4m(F-SsPp;BAIS zlH#^oV60;6zZ=CncuztRy6E%|7&;zq!zTcZ;6u7FQ1wap2%S;fz{e7<;SJ&Nr_>1n zId(4>p9$X2X#lG3g<|jeuM=P5t9tVFYf8WfEiN%64Jw97)zsA40-q2M%3ey-`T0_D zmYd#5`z06lNzKxTWq56aQ!1lrqhx0JDXqZKMKOeFk=G*J92JufXugRk8t8ppTtny` z6*$pkZx9O~P4xVh{v9AmG4ERwzoTUZTT+QTXdmlMWPU?O@6<0uVfc=o61~G{!FKF$ z&YnRhNeT@&NIp#OAt9ZVyZYtsRrG`)cdtOXhwic7sieHOzgO;G#lae^VDKJ>&iB#b z@qT%@&pBLX%cLRXSla3MGw4}rLkuS{LbN{e`6ON>>i5Lk=vZyXHu@>(zz=j*OFr(T zNWv!-LqDS~v4XMXTNqCzAD~H`uHdEV)NPC>@8D(OhPX)5aP|~* zlQ^Tpt%+aJF?}E5<*CFpVMO?dlZwDJE_(v9XR$VsBp!jFP&k8EJbF8!B@o|8wqH#o zdsi_VMnz2)IghQ4n1th!%eIR7nl-LGw5rMqVYoJLw38`lZ3ZyXII`y=@iLgZh}^Nc9~ diff --git a/ui-tests/bin/lib/CustomKeywords.class b/ui-tests/bin/lib/CustomKeywords.class deleted file mode 100644 index e35c7625d27b56f6bd4897607c207ced44826497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2440 zcmb7GZBrXn6n<_<*<`ydVR^AFtrd-sY%D1O>kG6B(F#o{+Efs+#$|H}3&}3sY*2ne ze~90)?eJnp$4_>~ALV%N?k0p`VeDk)ZgTH=dCqg6b2k6{`}>~&#?fTBoNqQcC$6zs%A@uV{W?=x)=sd+K%~V42fjJ)m_ub*YrkX-deXAw4&`) zvxZ&a8+x;m4FWoRy~YjKw5@F0c8WnNmnp(Ro`HSO&^>KhrhAW}E0tbSAmgHpC=`a? zWR<&ly;dukE}wB6eU~AZO0R~eYFe&Y=UId78)TntIZi3Kj2;;gBp9OZhS{J3iYF^0 zOjlCHP8McOt72N!DIZb4Kr}$W4cl`0FD_9NYE231x@j>CrdEra`i>q@>N@Duh@!B?bBwS~>b)NaDdL_I~FvK>)gH#8K#kEbki>d#!lRj;v;2jKK z#7(?Q(RHUvEcS)eNVn)TiGco8NDPKKmp9zrya}NpbLi#$8g}b;kg?(IIUbPuY^a z?mpt{+~JnNiK4-z;c(sM`A)Yo-Ey3C?K2z0BE$9b)EUD!q_XKGjf zZ~iu@!-^ADdTB-T)F1TvE7~NICEYRgwHkjc7P`HnY4L~6`WknF9l2yT9fRLDYaGLb zGb+eW$f6m5#52SYr>86!pp!Vwd3u%6`jmc+(la7-^@bYJj__U- z%g2#Keo*ct-uLp4cwhzS5jqi|W5S>9u|4m+g&9=1k2#K1+h>9hi+DriQ_$3OPE)m< z`oR%yM{tB(1g$U)GU_JNC}N2yCNN3gMbZgMDUyzA`}kCi{EC=%h|l+)W44%ijUKUk zh`E*G3(RKrQ4p8}=_K|bz|86C3`46lV zDAnpKJXs-{4)9YeHvN4F%qN4`spnYx8@;sdqxu&)6kbC;gjsln$_lyGUSLgoiES?e L`MQ)Mf(!ovcZY>G diff --git a/ui-tests/bin/lib/internal/GlobalVariable.class b/ui-tests/bin/lib/internal/GlobalVariable.class deleted file mode 100644 index 67d8e66bc00c8743a6060f8689a3b7d558952a5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3510 zcmb7HYj+b>6x}yXn=~Dy41zpFMXOCGZBq&Y@=$9PgrAAbR`3116bVU<18 zE$eo6ukB3f_7UB+^eNj+KnQdm(`WUpt(T{>2d9pihL=E#z?x~-ac1WN`Ck9KzS}CW zYN?<8Kv^JpaCm%Z^6tYq0X6qezdISLtLo{VWenSTwYsldbOf}V<4$J{r(l-!S~VMn zb{&Br)}Vfs`q{eSP6d}^RSGez7Fa1= z=6#5ZDG01h_cX~)!5XZUw(AsJhUM-2x>6wSm8>ewa!rnnppv@`JA}2VA%9`IdBe3T z-feT9DH$Fr=oMas1U8a9!!>o!9MvlVUFoA2pH@#Gs(F^3r515shprT^#q}+`SKwh3 z%%Wbiy(H2}BnA3Po>$qC%{s;jz0W8VtiFQn^%cz7{)+CEidMN`y8YA6Z2y$eZ|F&6 zX!38lUqp2ReI!SU1@@;e&iMaGLR69KPGDIKbf6!bBrsM)+nB4*TGb@BNI^_4tcdOZ zD`FG>+ok`TSU4d^wnG>tr|Rw4J}@wl#7-F`F0k2fX0pd;s@dbZr`x>!hU4FIx4PH zv~2T$K4UIzHDMH1ch!^~#4JS2lCt1s>tUs`CNDH7U&z$*7?aK6Zh>X8x*|24X~=Km zo}*wK_sB|_P>@20gm6?K-H`4EeJ+9f3AmnW&?R?A!w1>+H11Ok91_?h9!%i@=z-%! zTnY@?e;z=A8&xw3cwM?l&+0isU8_9n95?BwRQ5a~VSIu+CP*!7nbPw28iw*LScVu%23ZmOUHSH_l?mqcHP z-5ovI=5R>*O;OFJ!6WI^dFRxt;e?F-u)t+qvVlfM-iC+;$8I+76urY{(R9tSVRF>0 z?g}QwaMWya6E~JjjXHKF+ES@;C_KSlU9oFyqfZI6lJ6l3PqOm(dB?-1!NKB`$%Cxp zB%T$xyip*5t*q3BrPFL8`=i`%s0js+;c_N%FEg&6^Vb%7kRxEV z_5)VV^KGY{$NJG;ZSs3;=pFxtI|5&DRrohftE+G|e40jKz zw=Cec80K;3uh^f<`0hpqwTy2*+Ux($4fd*!;RL#I z2zL?Q3%CM@DU0Dt%GZ%pP?F-iQNvnx@Aa6&2AslGopJe=3<=y!{TMa7N!$@N_BE2) zJnlXFE$+)@e#detoyXKf?i}vRoQHXqs^}DQ7=#Y4qq&fwwC}KC;y1+4j%yP<1Rj8t z)D4Q54h_^WVw;wsjyxjiummgIU(4f=N4ku$k7=3S1vqik-Bj>UsJ4bmGI1qPTY%TH zs8z#kQ)hE=1Tj;x;zPA=p5c4lb`t>X!{lOj3Mzig1EdE diff --git a/ui-tests/console.properties b/ui-tests/console.properties deleted file mode 100644 index c89f16f3d..000000000 --- a/ui-tests/console.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Wed Dec 05 10:12:31 PST 2018 -deviceId= -kobitonDeviceId= -remoteWebDriverType=Selenium -remoteWebDriverUrl= diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh deleted file mode 100644 index eca6a0d3c..000000000 --- a/ui-tests/runTests.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui-tests/runTestsTesting.sh b/ui-tests/runTestsTesting.sh deleted file mode 100644 index 76ff80ecc..000000000 --- a/ui-tests/runTestsTesting.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/TestingTestSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties b/ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui-tests/settings/internal/com.kms.katalon.execution.properties b/ui-tests/settings/internal/com.kms.katalon.execution.properties deleted file mode 100644 index 59a525faa..000000000 --- a/ui-tests/settings/internal/com.kms.katalon.execution.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Dec 11 09:06:20 PST 2018 -execution.default.executionConfiguration="Chrome" -execution.default.timeout=30 -execution.default.openReportAfterExecuting=false -execution.default.quitDriversAfterExecutingTestCase=false -execution.default.quitDriversAfterExecutingTestSuite=true diff --git a/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties b/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties deleted file mode 100644 index 11075e853..000000000 --- a/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Dec 11 09:06:20 PST 2018 -execution.default.webUi.enablePageLoadTimeout=false -execution.default.webUi.pageLoadTimeout=30 -execution.default.webUi.ignorePageLoadTimeOutException=false -execution.default.webUi.actionDelay=0 -execution.default.waitForIEHanging=600 diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties deleted file mode 100644 index 20d3d6ab8..000000000 --- a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Tue Dec 11 13:13:12 PST 2018 -analytics.integration.enable=false diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.jira.properties b/ui-tests/settings/internal/com.kms.katalon.integration.jira.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties b/ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui-tests/sonar-project.properties b/ui-tests/sonar-project.properties deleted file mode 100644 index b19e55a67..000000000 --- a/ui-tests/sonar-project.properties +++ /dev/null @@ -1,32 +0,0 @@ -sonar.projectKey=ocwa -sonar.projectName=OCWA Scanning -sonar.projectVersion=0.0.1 -sonar.organization=ajc_bcgov - -sonar.host.url=https://sonarcloud.io - -sonar.sources=src - -sonar.dynamicAnalysis=reuseReports - -sonar.javascript.lcov.reportPaths=coverage/lcov.info -sonar.python.coverage.reportPath=microservices/*/coverage.xml - -# sonar.modules=frontend,forumApi,policyApi,requestApi,validateApi - -frontend.sonar.projectBaseDir=frontend -frontend.sonar.sources=src,server - -forumApi.sonar.projectBaseDir=microservices/forumApi -forumApi.sonar.sources=auth,bin,db,routes - -requestApi.sonar.projectBaseDir=microservices/requestApi -requestApi.sonar.sources=auth,bin,db,routes - -policyApi.sonar.projectBaseDir=microservices -policyApi.sonar.sources=policyApi/db,policyApi/v1 -policyApi.sonar.python.coverage.reportPath=policyApi/coverage.xml - -validateApi.sonar.projectBaseDir=microservices -validateApi.sonar.sources=validateApi/db,validateApi/v1,validateApi/validator -validateApi.sonar.python.coverage.reportPath=validateApi/coverage.xml diff --git a/ui_tests/.gitignore b/ui_tests/.gitignore index 0b12e47b0..8ce403b55 100644 --- a/ui_tests/.gitignore +++ b/ui_tests/.gitignore @@ -6,3 +6,4 @@ Profiles/default.glbl .settings /bin/ Libs/TempTest*.groovy +Libs/TempTemp*.groovy \ No newline at end of file diff --git a/ui_tests/.project b/ui_tests/.project index a3c48d6bb..3955e7e6b 100644 --- a/ui_tests/.project +++ b/ui_tests/.project @@ -1,74 +1,92 @@ - - - OCWA.prj - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.groovy.core.groovyNature - org.eclipse.jdt.core.javanature - - - - 0 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 0 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 0 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 0 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 1545259433429 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1545259433448 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - + + + OCWA.prj + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + + + 0 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 0 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 0 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 0 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545259433429 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545259433448 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545415474049 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545415474069 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + diff --git a/ui_tests/Data Files/TestFile1.dat b/ui_tests/Data Files/TestFile1.dat new file mode 100644 index 000000000..ef8081321 --- /dev/null +++ b/ui_tests/Data Files/TestFile1.dat @@ -0,0 +1,16 @@ + + + file for testing upload + TestFile1 + + true + COMMA + 679aba66-2311-432f-8bab-84485811301a + C:\Users\PaulR\Documents\2 - Metadata\HAS project\hospital_visits_bc_2017.csv + CSV + false + + false + + false + diff --git a/ui_tests/Data Files/TestFile2.dat b/ui_tests/Data Files/TestFile2.dat new file mode 100644 index 000000000..4e68b8432 --- /dev/null +++ b/ui_tests/Data Files/TestFile2.dat @@ -0,0 +1,16 @@ + + + File for testing file upload + TestFile2 + + true + + 22393f29-c163-446c-aa0b-da83fe18248a + C:\Users\PaulR\Documents\2 - Metadata\HAS project\sports_accidents_bc_2017.xls + ExcelFile + false + + false + sports_accidents_bc_2017 + false + diff --git a/ui_tests/Include/features/Login.feature b/ui_tests/Include/features/Login.feature deleted file mode 100644 index 9a29cd767..000000000 --- a/ui_tests/Include/features/Login.feature +++ /dev/null @@ -1,32 +0,0 @@ -#Author: your.email@your.domain.com -#Keywords Summary : -#Feature: List of scenarios. -#Scenario: Business rule through list of steps with arguments. -#Given: Some precondition step -#When: Some key actions -#Then: To observe outcomes or validation -#And,But: To enumerate more Given,When,Then steps -#Scenario Outline: List of steps for data-driven as an Examples and -#Examples: Container for s table -#Background: List of steps run before each of the scenarios -#""" (Doc Strings) -#| (Data Tables) -#@ (Tags/Labels):To group Scenarios -#<> (placeholder) -#"" -## (Comments) -#Sample Feature Definition Template - - -@loginFeature -Feature: Login - Test the login functionality of the application - - @smoke - Scenario: Test the login functionality of EA application - Given I navigate to the login page - And I enter the following for Login - | username | password | - | admin | adminpassword | - And I click the login button - Then I should see the home page \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 5f5053221..6afe54667 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -57,32 +57,34 @@ class Requester_step_def_ks { @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') - WebUI.delay(5) - WebUI.closeBrowser() - - //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + TestObject loginButton = new TestObject("app-auth-login-button") + loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) + WebUI.waitForElementClickable(loginButton, 30) + WebUI.click(loginButton) - //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - //WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - //WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } @Given("requester has started a request") def requester_starts_new_request() { - //newRequestButtonObject = new TestObject("new-request-button") - //newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + newRequestButtonObject = new TestObject("new-request-button") + newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - //WebUI.waitForPageLoad(30) + WebUI.waitForPageLoad(30) + WebUI.delay(5) - //WebUI.waitForElementClickable(newRequestButtonObject, 30) - //WebUI.click(newRequestButtonObject) - //request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() - //WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + WebUI.waitForElementClickable(newRequestButtonObject, 30) + WebUI.click(newRequestButtonObject) + request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + WebUI.delay(2) } @Given("has not submitted the request") @@ -91,66 +93,75 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { - // selenium.click("id=request-form-save-files-button") - // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") - } - - @Given("the output files do not violate any blocking rules") - def output_files_do_not_violate_blocking_rules(){} - - @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") - def requester_affirms_output_is_safe() { - } - - @Given("requester has a submitted request") - def request_has_submitted_a_request(){ - requester_starts_new_request() - requester_adds_output_files() - requester_submits_request() - } - - @Given("the request has been claimed by an output checker") - def request_has_been_claimed_by_a_oc(){} - - @When("the requester saves their request") - def requester_saves_new_request() { - //requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - //requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - //WebUI.click(requestFormSaveCloseButtonObject) - } - @When("requester submits their request") - def requester_submits_request() { - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") + requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, "request-form-save-files-button", true) + WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) + WebUI.click(requestFormSaveFilesButton) + TestObject uploadFileButton = new TestObject("fileUploadButton") + uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true) + //WebUI.sendKeys(uploadFileButton, "C:\\\\Users\\PaulR\\\\Documents\\\\2 - Metadata\\\\HAS project\\\\hospital_visits_bc_2017.csv") + //WebUI.sendKeys(uploadFileButton, findTestData('TestFile1')) + //WebUI.sendKeys(uploadFileButton, '/Data Files/TestFile1')) + //WebUI.delay(5) } - @When("requester writes and submits a new comment") - def requester_creates_a_new_comment(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Smcuk')) - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) - - //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) - - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') - } - - @Then("the requester should be able to re-open the request and pick up where they left off") - def confirm_draft_save_was_successful() { - //WebUI.waitForPageLoad(0) - //WebUI.verifyTextPresent(request_name, false) - } - - @Then("the requester's request is put in awaiting review") - def confirm_request_is_in_awaiting_review_state(){ - WebUI.verifyTextPresent("Awaiting review", false) - } - - @Then("the requester should not be able to submit the request") - def requester_is_not_able_to_submit_request(){ - WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) - } +@Given("the output files do not violate any blocking rules") +def output_files_do_not_violate_blocking_rules(){} + +@Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") +def requester_affirms_output_is_safe() { +} + +@Given("requester has a submitted request") +def request_has_submitted_a_request(){ + requester_starts_new_request() + requester_adds_output_files() + requester_submits_request() +} + +@Given("the request has been claimed by an output checker") +def request_has_been_claimed_by_a_oc(){} + +@When("the requester saves their request") +def requester_saves_new_request() { + requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + WebUI.click(requestFormSaveCloseButtonObject) +} + +@When("requester submits their request") +def requester_submits_request() { + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) +} + +@When("requester writes and submits a new comment") +def requester_creates_a_new_comment(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) + + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') +} + +@Then("the requester should be able to re-open the request and pick up where they left off") +def confirm_draft_save_was_successful() { + WebUI.waitForPageLoad(20) + WebUI.verifyTextPresent(request_name, false) + WebUI.closeBrowser() +} + +@Then("the requester's request is put in awaiting review") +def confirm_request_is_in_awaiting_review_state(){ + WebUI.verifyTextPresent("Awaiting review", false) + WebUI.closeBrowser() +} + +@Then("the requester should not be able to submit the request") +def requester_is_not_able_to_submit_request(){ + WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + WebUI.closeBrowser() +} } \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy deleted file mode 100644 index 1e1f8b79e..000000000 --- a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy +++ /dev/null @@ -1,14 +0,0 @@ -package com.ea.steps - - -import org.junit.runner.RunWith; - -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; - - - -@RunWith(Cucumber.class) -@CucumberOptions(features="ui_tests/Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) -public class CucumberEARunner { -} diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy deleted file mode 100644 index efe3bfe0d..000000000 --- a/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy +++ /dev/null @@ -1,103 +0,0 @@ -package com.ea.steps -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI - -import cucumber.api.TypeRegistry; -import cucumber.api.TypeRegistryConfigurer; -import cucumber.api.java.en.And -import cucumber.api.java.en.Given -import cucumber.api.java.en.Then -import cucumber.api.java.en.When -import io.cucumber.datatable.DataTableType; -import io.cucumber.datatable.TableEntryTransformer; - - -/* - * Author: Karthik KK - * Company: ExecuteAutomation - * Type: StepDefinition - * Step : LoginStep - */ -class LoginSteps { - @Given("I navigate to the login page") - def I_navigate_to_the_login_page() { - WebUI.openBrowser('') - WebUI.navigateToUrl('http://www.executeautomation.com/demosite/Login.html') - } - - - //Obsolete step - @When('I enter the username as "(.*) and password as "(.*)"') - def I_enter_username_password(String userName, String password) { - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), userName) - - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), password) - } - - @And("I enter the following for Login") - def I_enter_the_following_for_login(List table){ - // Way 1 - To get data from DataTable Type - // List> data = table.asMaps(String.class, String.class); - - // Way 2 - To get work with custom types using Lust - // //Create an ArrayList - // List users = new ArrayList(); - // //Store all the users - // users = table.asList(User.class); - - - //Iterate through the values - for (User user: table){ - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), user.username) - - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), user.password) - } - } - - - @Then("I click the login button") - def I_Click_login_button() { - WebUI.click(findTestObject('Object Repository/Page_Execute Automation/input_Login_Login')) - } - - @Then("I should see the home page") - def I_Should_see_the_home_page(){ - - //Assertions has been done ! - } -} - - -//Custom class responsible to get UserName and Password from table steps -class User { - public String username; - public String password; - - public User(String userName, String passWord) { - username= userName; - password = passWord; - } -} - - -//Custom Transformer to convert the custom User type -class Configurer implements TypeRegistryConfigurer { - - @Override - public void configureTypeRegistry(TypeRegistry registry) { - - registry.defineDataTableType(new DataTableType(User.class, new TableEntryTransformer() { - @Override - public User transform(Map entry) { - return new User(entry.get("username"),entry.get("password")); - } - })); - } - - @Override - public Locale locale() { - return Locale.ENGLISH; - } - -} diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy similarity index 100% rename from ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy rename to ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy diff --git a/ui_tests/Libs/CustomKeywords.groovy b/ui_tests/Libs/CustomKeywords.groovy index c595a4f8a..9457decb7 100644 --- a/ui_tests/Libs/CustomKeywords.groovy +++ b/ui_tests/Libs/CustomKeywords.groovy @@ -3,3 +3,7 @@ * This class is generated automatically by Katalon Studio and should not be modified or deleted. */ + +def static "test_OCWA_keywords.random_test_request_name.gen_random_test_request_name"() { + (new test_OCWA_keywords.random_test_request_name()).gen_random_test_request_name() +} diff --git a/ui_tests/Libs/internal/GlobalVariable.groovy b/ui_tests/Libs/internal/GlobalVariable.groovy index 073fd2170..51b9af8e5 100644 --- a/ui_tests/Libs/internal/GlobalVariable.groovy +++ b/ui_tests/Libs/internal/GlobalVariable.groovy @@ -21,7 +21,7 @@ public class GlobalVariable { static { def allVariables = [:] - allVariables.put('default', [:]) + allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca']) allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) String profileName = RunConfiguration.getExecutionProfile() diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs similarity index 96% rename from ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs rename to ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs index 231e9f891..e4f34d42a 100644 --- a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs @@ -1,107 +1,107 @@ - - - - input_Password_login - - b03993b5-c5ae-4031-8150-2361e6dc57b7 - - - XPATH - //input[@id='kc-login'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - tabindex - Main - 4 - - - false - equals - class - Main - btn btn-primary btn-lg - - - true - equals - name - Main - login - - - true - equals - id - Main - kc-login - - - true - equals - type - Main - submit - - - false - equals - value - Main - Log in - - - false - equals - xpath - Main - id("kc-login") - - - true - equals - xpath:attributes - //input[@id='kc-login'] - - - false - equals - xpath:idRelative - //div[@id='kc-form-buttons']/div/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'kc-login', '"', ')')])[1]/preceding::input[1] - - - false - equals - xpath:position - //div[3]/div[2]/div/input - - + + + + input_Password_login + + b03993b5-c5ae-4031-8150-2361e6dc57b7 + + + XPATH + //input[@id='kc-login'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 4 + + + false + equals + class + Main + btn btn-primary btn-lg + + + true + equals + name + Main + login + + + true + equals + id + Main + kc-login + + + true + equals + type + Main + submit + + + false + equals + value + Main + Log in + + + false + equals + xpath + Main + id("kc-login") + + + true + equals + xpath:attributes + //input[@id='kc-login'] + + + false + equals + xpath:idRelative + //div[@id='kc-form-buttons']/div/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'kc-login', '"', ')')])[1]/preceding::input[1] + + + false + equals + xpath:position + //div[3]/div[2]/div/input + + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs similarity index 96% rename from ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs rename to ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs index 9a0da9be0..4b818c9f3 100644 --- a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs @@ -1,107 +1,107 @@ - - - - input_Password_password - - 0e5ab8cd-490d-4fe5-8476-6643d833291e - - - XPATH - //input[@id='password'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - tabindex - Main - 2 - - - true - equals - id - Main - password - - - false - equals - class - Main - form-control - - - true - equals - name - Main - password - - - true - equals - type - Main - password - - - false - equals - autocomplete - Main - off - - - false - equals - xpath - Main - id("password") - - - true - equals - xpath:attributes - //input[@id='password'] - - - false - equals - xpath:idRelative - //form[@id='kc-form-login']/div[2]/div[2]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[2] - - - false - equals - xpath:position - //div[2]/div[2]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[2] - - + + + + input_Password_password + + 0e5ab8cd-490d-4fe5-8476-6643d833291e + + + XPATH + //input[@id='password'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 2 + + + true + equals + id + Main + password + + + false + equals + class + Main + form-control + + + true + equals + name + Main + password + + + true + equals + type + Main + password + + + false + equals + autocomplete + Main + off + + + false + equals + xpath + Main + id("password") + + + true + equals + xpath:attributes + //input[@id='password'] + + + false + equals + xpath:idRelative + //form[@id='kc-form-login']/div[2]/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[2] + + + false + equals + xpath:position + //div[2]/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[2] + + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs similarity index 96% rename from ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs rename to ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs index e4518409c..6f517919f 100644 --- a/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs @@ -1,113 +1,113 @@ - - - - input_Username or email_userna - - 1e087123-1a2b-412f-9b3f-f68243f2f4cc - - - XPATH - //input[@id='username'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - tabindex - Main - 1 - - - true - equals - id - Main - username - - - false - equals - class - Main - form-control - - - true - equals - name - Main - username - - - true - equals - type - Main - text - - - false - equals - autocomplete - Main - off - - - false - equals - xpath - Main - id("username") - - - true - equals - xpath:attributes - //input[@id='username'] - - - false - equals - xpath:idRelative - //form[@id='kc-form-login']/div/div[2]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='ocwa'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/preceding::input[1] - - - false - equals - xpath:position - //input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[3] - - + + + + input_Username or email_userna + + 1e087123-1a2b-412f-9b3f-f68243f2f4cc + + + XPATH + //input[@id='username'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 1 + + + true + equals + id + Main + username + + + false + equals + class + Main + form-control + + + true + equals + name + Main + username + + + true + equals + type + Main + text + + + false + equals + autocomplete + Main + off + + + false + equals + xpath + Main + id("username") + + + true + equals + xpath:attributes + //input[@id='username'] + + + false + equals + xpath:idRelative + //form[@id='kc-form-login']/div/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='ocwa'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/preceding::input[1] + + + false + equals + xpath:position + //input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[3] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs b/ui_tests/Object Repository/Page_OCWA Development Version/a_Discussion.rs similarity index 58% rename from ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs rename to ui_tests/Object Repository/Page_OCWA Development Version/a_Discussion.rs index 4b8862f1c..cd2c58b6c 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/a_Discussion.rs @@ -1,91 +1,98 @@ - - - - a_gfggggg - - 8030b58a-35da-4934-a959-42f86e9e595f - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table/tbody/tr/td[2]/strong/a - - - XPATH - false - - true - equals - tag - Main - a - - - true - equals - href - Main - /requests/5c08241fe35b430013db0cae - - - true - equals - text - Main - gfggggg - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainerAdvanced__Container-sc-1s2zdt8-0 cFyKDm"]/table[@class="DynamicTable__Table-sc-1naczgt-0 cFUPVR"]/tbody[1]/tr[@class="TableRow__TableBodyRow-sc-1kwbh2h-0 jLQmXi"]/td[@class="TableCell__TableBodyCell-sc-1mgclzx-0 dGStZT"]/strong[1]/a[1] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table/tbody/tr/td[2]/strong/a - - - false - equals - xpath:link - //a[contains(text(),'gfggggg')] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Output Checker'])[1]/following::a[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Updated On'])[1]/following::a[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Dec 5th, 2018'])[1]/preceding::a[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Dec 5th, 2018'])[2]/preceding::a[1] - - - false - equals - xpath:href - //a[contains(@href, '/requests/5c08241fe35b430013db0cae')] - - - false - equals - xpath:position - //strong/a - - + + + + a_Discussion + + 8d15b0ae-a30c-4777-bee4-b4d0055b26ff + + + BASIC + //a[(text() = ' Discussion' or . = ' Discussion')] + + + BASIC + false + + true + equals + tag + Main + a + + + false + equals + class + Main + src-modules-requests-components-request-styles_tab--gsRHpC7s + + + false + equals + href + Main + /requests/5c09b8cc4dd24b0013dafd7e/discussion + + + true + equals + text + Main + Discussion + + + false + equals + xpath + Main + id("requests-page")/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-request-styles_header--3R28zHQp"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG igkucF"]/div[1]/nav[@class="src-modules-requests-components-request-styles_tabs--uQAijO0U"]/a[@class="src-modules-requests-components-request-styles_tab--gsRHpC7s"] + + + true + equals + xpath:idRelative + //div[@id='requests-page']/div/div/div[2]/header/div[2]/div/div/nav/a[2] + + + false + equals + xpath:link + //a[contains(text(),'Discussion')] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Details'])[1]/following::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Awaiting Review'])[1]/following::a[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Purpose'])[1]/preceding::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Export Files'])[1]/preceding::a[1] + + + false + equals + xpath:href + //a[contains(@href, '/requests/5c09b8cc4dd24b0013dafd7e/discussion')] + + + false + equals + xpath:position + //a[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs b/ui_tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs similarity index 97% rename from ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs rename to ui_tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs index e44636ebc..ad24da384 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs @@ -1,111 +1,111 @@ - - - - input_Request Name_name - - 381e4370-629e-492b-bd3c-5ca7701548b9 - - - XPATH - //input[@id='name'] - - - BASIC - //input[@id = 'name' and @name = 'name' and @type = 'text'] - - - BASIC - false - - true - equals - tag - Main - input - - - false - equals - class - Main - Input__InputElement-sc-1o6bj35-0 bfCuIo - - - true - equals - id - Main - name - - - true - equals - name - Main - name - - - false - equals - spellcheck - Main - true - - - true - equals - type - Main - text - - - false - equals - value - Main - R - - - false - equals - xpath - Main - id("name") - - - true - equals - xpath:attributes - //input[@id='name'] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('These fields aren', "'", 't required but are recommended')])[1]/preceding::input[1] - - - false - equals - xpath:position - //div/div/div/div/div/input - - + + + + input_Request Name_name + + 381e4370-629e-492b-bd3c-5ca7701548b9 + + + XPATH + //input[@id='name'] + + + BASIC + //input[@id = 'name' and @name = 'name' and @type = 'text'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + class + Main + Input__InputElement-sc-1o6bj35-0 bfCuIo + + + true + equals + id + Main + name + + + true + equals + name + Main + name + + + false + equals + spellcheck + Main + true + + + true + equals + type + Main + text + + + false + equals + value + Main + R + + + false + equals + xpath + Main + id("name") + + + true + equals + xpath:attributes + //input[@id='name'] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('These fields aren', "'", 't required but are recommended')])[1]/preceding::input[1] + + + false + equals + xpath:position + //div/div/div/div/div/input + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Save (1).rs similarity index 64% rename from ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs rename to ui_tests/Object Repository/Page_OCWA Development Version/span_Save (1).rs index 03b281a97..8fbb80be0 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Save (1).rs @@ -1,70 +1,60 @@ - - - - span_New Request_1 - - c057b988-a971-4de5-80a1-50d6b5f07785 - - - XPATH - //button[@id='new-request-button']/span/span[2] - - - BASIC - id("new-request-button")/span[1]/span[2][count(. | //span[(text() = 'New Request' or . = 'New Request')]) = count(//span[(text() = 'New Request' or . = 'New Request')])] - - - BASIC - false - - true - equals - tag - Main - span - - - true - equals - text - Main - New Request - - - true - equals - xpath - Main - id("new-request-button")/span[1]/span[2] - - - true - equals - xpath:idRelative - //button[@id='new-request-button']/span/span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] - - - false - equals - xpath:position - //span[2] - - + + + + span_Save (1) + + 557e2e28-1535-41ee-bc5c-0891d683ab62 + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Save + + + false + equals + xpath + Main + id("request-form-save-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //button[@id='request-form-save-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Submit for Review'])[1]/preceding::span[1] + + + false + equals + xpath:position + //div[3]/div/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs similarity index 64% rename from ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs rename to ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs index 8d0b1ce38..f6d179138 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs @@ -1,54 +1,54 @@ - - - - span_Login - - 43ba404e-395a-4174-ad6f-b2c20759c0af - - - XPATH - //span/span - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Login - - - false - equals - xpath - Main - id("app-auth-login-button")/span[1]/span[1] - - - true - equals - xpath:idRelative - //a[@id='app-auth-login-button']/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] - - - false - equals - xpath:position - //span/span - - + + + + span_Submit for Review + + f241e897-ea5f-4f0b-a1e4-6f96813f8653 + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Submit for Review + + + false + equals + xpath + Main + id("request-form-submit-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //button[@id='request-form-submit-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/following::span[4] + + + false + equals + xpath:position + //div[3]/div[2]/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Withdraw.rs similarity index 67% rename from ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs rename to ui_tests/Object Repository/Page_OCWA Development Version/span_Withdraw.rs index e2c0eb8be..b89ddb147 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Withdraw.rs @@ -1,79 +1,73 @@ - - - - span_New Request (1) - - 804916e5-5448-43d1-9965-9b4bfe3f5ebf - - - XPATH - //div[@id='main']/div/div/main/div/div/button/span/span[2] - - - BASIC - false - - true - equals - tag - Main - span - - - true - equals - text - Main - New Request - - - true - equals - xpath - Main - id("new-request-button")/span[1]/span[2] - - - true - equals - id - Main - new-request-button - - - true - equals - xpath:idRelative - //button[@id='new-request-button']/span/span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] - - - false - equals - xpath:position - //span[2] - - - false - equals - xpath:idRelative - //div[@id='main']/div/div/main/div/div/button/span/span[2] - - + + + + span_Withdraw + + b8e20b19-e579-48bd-93f9-9457ad427bdc + BASIC + false + + true + equals + tag + Main + span + + + false + equals + class + Main + ItemParts__Content-sc-14xek3m-5 jRBaLt + + + true + equals + text + Main + Withdraw + + + false + equals + xpath + Main + id("259cb670-fe56-11e8-a449-7fc7a1df17a7")/div[1]/span[@class="Item-z6qfkt-2 fawwoK"]/span[@class="ItemParts__ContentWrapper-sc-14xek3m-4 eDgbRC"]/span[@class="ItemParts__Content-sc-14xek3m-5 jRBaLt"] + + + true + equals + xpath:idRelative + //div[@id='259cb670-fe56-11e8-a449-7fc7a1df17a7']/div/span/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Actions'])[11]/following::span[5] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='-'])[11]/following::span[7] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Test Anotehr'])[1]/preceding::span[5] + + + false + equals + xpath:position + //div/span/span/span + + diff --git a/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy b/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy deleted file mode 100644 index f297771da..000000000 --- a/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy +++ /dev/null @@ -1,18 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.ea.steps.CucumberEARunner -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - -CucumberKW.runWithCucumberRunner(CucumberEARunner.class) diff --git a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy index 3b1c2856f..06baecc91 100644 --- a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy +++ b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy @@ -15,3 +15,7 @@ import internal.GlobalVariable as GlobalVariable CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +not_run: CucumberKW.runFeatureFile('Include/features/requester/create_a_new_request.feature') + +//WebUI.uploadFile(findTestObject(null), findTestData('TestFile1').getValue(1, 1)) + diff --git a/ui_tests/Test Cases/ExecuteAutomation_TC1.tc b/ui_tests/Test Cases/ExecuteAutomation_TC1.tc deleted file mode 100644 index fce57605d..000000000 --- a/ui_tests/Test Cases/ExecuteAutomation_TC1.tc +++ /dev/null @@ -1,8 +0,0 @@ - - - - ExecuteAutomation_TC1 - - - 9ccc1ff2-1a70-4f4b-ad95-dad93a1390b8 - diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts index d2f5f6ad0..366755943 100644 --- a/ui_tests/Test Suites/CucumberSuite.ts +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -1,20 +1,20 @@ - - - - CucumberSuite - - false - 2018-12-19T14:46:16 - - 0 - 30 - true - false - 4efd54cc-68dc-4a64-a8f1-7ae0c49473f5 - - f69ad29e-d701-467b-8299-76addc057f6a - false - true - Test Cases/RunCucumberTests - - + + + + CucumberSuite + + false + 2018-12-21T10:04:40 + + 0 + 30 + true + false + 4efd54cc-68dc-4a64-a8f1-7ae0c49473f5 + + f69ad29e-d701-467b-8299-76addc057f6a + false + true + Test Cases/RunCucumberTests + + diff --git a/ui_tests/Test Suites/TestSuite1.groovy b/ui_tests/Test Suites/TestSuite1.groovy deleted file mode 100644 index 49ab4777d..000000000 --- a/ui_tests/Test Suites/TestSuite1.groovy +++ /dev/null @@ -1,66 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject - -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile - -import internal.GlobalVariable as GlobalVariable - -import com.kms.katalon.core.annotation.SetUp -import com.kms.katalon.core.annotation.SetupTestCase -import com.kms.katalon.core.annotation.TearDown -import com.kms.katalon.core.annotation.TearDownTestCase - -/** - * Some methods below are samples for using SetUp/TearDown in a test suite. - */ - -/** - * Setup test suite environment. - */ -@SetUp(skipped = true) // Please change skipped to be false to activate this method. -def setUp() { - // Put your code here. -} - -/** - * Clean test suites environment. - */ -@TearDown(skipped = true) // Please change skipped to be false to activate this method. -def tearDown() { - // Put your code here. -} - -/** - * Run before each test case starts. - */ -@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. -def setupTestCase() { - // Put your code here. -} - -/** - * Run after each test case ends. - */ -@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. -def tearDownTestCase() { - // Put your code here. -} - -/** - * References: - * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ - */ \ No newline at end of file diff --git a/ui_tests/Test Suites/TestSuite1.ts b/ui_tests/Test Suites/TestSuite1.ts deleted file mode 100644 index a15c181f7..000000000 --- a/ui_tests/Test Suites/TestSuite1.ts +++ /dev/null @@ -1,20 +0,0 @@ - - - - TestSuite1 - - false - 2018-12-19T13:44:58 - - 0 - 30 - true - false - e8a1ffd6-0ef9-4ac4-9cad-c711a822a0a5 - - 2521c26f-59d1-446f-9fbe-59281ccceb99 - false - true - Test Cases/ExecuteAutomation_TC1 - - diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh deleted file mode 100644 index 79d2780ee..000000000 --- a/ui_tests/runTests.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties index e69de29bb..69aff29b0 100644 --- a/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties +++ b/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties @@ -0,0 +1,9 @@ +#Thu Dec 20 15:08:54 PST 2018 +analytics.integration.enable=false +analytics.authentication.encryptionEnabled=true +analytics.server.endpoint="JkYzbGlbK9hM2kll81qSoXfzapQDQgaKmEIPN3wKSiw\=" +analytics.authentication.email="AxsQjog1bPIUG8VBB6gpp84F7pbRMrNxvsgIrp3z4Lk\=" +analytics.authentication.password="vp5NOwKb2bEOvJi9f6HRYQ\=\=" +analytics.authentication.token="2HXG0Q6IpFQXdOjqg6HLS4RNXdXULS3VOaOCVle/uPQHip8U2YTI2A\=\=" +analytics.team="{\\n \\"id\\"\: 10951,\\n \\"role\\"\: \\"OWNER\\",\\n \\"name\\"\: \\"Team paul.ripley@avocette.com\\"\\n}" +analytics.project="{\\n \\"id\\"\: 12655,\\n \\"name\\"\: \\"First Project\\",\\n \\"teamId\\"\: 10951\\n}" From 980fda2bb7de6a87aa7022420d34476cf7d463bf Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 13:29:10 -0800 Subject: [PATCH 064/226] hard coded url to navigate to in order to troubleshoot issue --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 3 ++- ui_tests/Test Suites/CucumberSuite.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 6afe54667..d71914ff5 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -58,7 +58,8 @@ class Requester_step_def_ks { def requester_login() { WebUI.openBrowser('') - WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = new TestObject("app-auth-login-button") loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) WebUI.waitForElementClickable(loginButton, 30) diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts index 366755943..d3f3504cb 100644 --- a/ui_tests/Test Suites/CucumberSuite.ts +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -4,7 +4,7 @@ CucumberSuite false - 2018-12-21T10:04:40 + 2018-12-21T12:54:35 0 30 From 80bf0d63ab303086d1e39fe4c415e9a85a7e44f8 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 14:12:58 -0800 Subject: [PATCH 065/226] add in starting up of frontend --- .travis.yml | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31cfdfca9..b5a93f799 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,34 +57,47 @@ matrix: - cp config/default.json.example config/default.json - yarn - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - + #Start Forum Api - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - NODE_ENV=test npm start & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - - cd /home/travis/build/bcgov/OCWA/frontend + #Start Minio - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - chmod +x minio - export MINIO_ACCESS_KEY="myKey" - export MINIO_SECRET_KEY="mySecret" - ./minio server /tmp & + + #Start TusD + - wget https://github.com/tus/tusd/releases/download/$TUSD_VERSION/tusd_linux_amd64.tar.gz + - export AWS_ACCESS_KEY_ID=$MINIO_ACCESS_KEY + - export AWS_SECRET_ACCESS_KEY=$MINIO_SECRET_KEY + - export AWS_REGION=us-east-1 + - tusd -s3-endpoint http://localhost:9000 -s3-bucket myBucket & + + #Start Validate Api - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & + + #Start Policy Api - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & + + #Start Request Api + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + #Start FrontEnd + - cd /home/travis/build/bcgov/OCWA/frontend + - NODE_ENV=test yarn start & #Katalon requires OpenJDK 8 installed separately - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk @@ -112,6 +125,7 @@ env: - CXX=g++-4.8 - MONGODB=4.1.1 - KATALON_VERSION=5.9.0 + - TUSD_VERSION=0.11.0 - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - SONAR_APP=sonar-scanner - SONAR_VERSION=3.2.0.1227-linux From f0cbe7d45fafe0bb5ddd05da70b0012765acf0dd Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 14:34:51 -0800 Subject: [PATCH 066/226] fixed some yarn-y stuff in Travis and commented out more tricky tests --- .travis.yml | 10 +++++++--- .../scripts/groovy/Requester_step_def_ks.groovy | 16 ++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5a93f799..da89a4186 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,14 +62,14 @@ matrix: - NODE_ENV=test npm start & #Start Minio - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - wget --quiet https://dl.minio.io/server/minio/release/linux-amd64/minio - chmod +x minio - export MINIO_ACCESS_KEY="myKey" - export MINIO_SECRET_KEY="mySecret" - ./minio server /tmp & #Start TusD - - wget https://github.com/tus/tusd/releases/download/$TUSD_VERSION/tusd_linux_amd64.tar.gz + - wget --quiet https://github.com/tus/tusd/releases/download/$TUSD_VERSION/tusd_linux_amd64.tar.gz - export AWS_ACCESS_KEY_ID=$MINIO_ACCESS_KEY - export AWS_SECRET_ACCESS_KEY=$MINIO_SECRET_KEY - export AWS_REGION=us-east-1 @@ -92,11 +92,15 @@ matrix: - python3 wsgi.py & #Start Request Api - - NODE_ENV=test npm start & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/default.json.template config/default.json + - cp config/test.json.template config/test.json + - NODE_ENV=test npm start & #Start FrontEnd - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/default.json.template config/default.json + - yarn - NODE_ENV=test yarn start & #Katalon requires OpenJDK 8 installed separately diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index d71914ff5..333510c30 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -75,7 +75,7 @@ class Requester_step_def_ks { @Given("requester has started a request") def requester_starts_new_request() { - newRequestButtonObject = new TestObject("new-request-button") + /*newRequestButtonObject = new TestObject("new-request-button") newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) WebUI.waitForPageLoad(30) @@ -85,7 +85,7 @@ class Requester_step_def_ks { WebUI.click(newRequestButtonObject) request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) - WebUI.delay(2) + WebUI.delay(2)*/ } @Given("has not submitted the request") @@ -95,12 +95,12 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { - TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") + /*TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, "request-form-save-files-button", true) WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) TestObject uploadFileButton = new TestObject("fileUploadButton") - uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true) + uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true)*/ //WebUI.sendKeys(uploadFileButton, "C:\\\\Users\\PaulR\\\\Documents\\\\2 - Metadata\\\\HAS project\\\\hospital_visits_bc_2017.csv") //WebUI.sendKeys(uploadFileButton, findTestData('TestFile1')) //WebUI.sendKeys(uploadFileButton, '/Data Files/TestFile1')) @@ -126,9 +126,9 @@ def request_has_been_claimed_by_a_oc(){} @When("the requester saves their request") def requester_saves_new_request() { - requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + /*requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - WebUI.click(requestFormSaveCloseButtonObject) + WebUI.click(requestFormSaveCloseButtonObject)*/ } @When("requester submits their request") @@ -149,8 +149,8 @@ def requester_creates_a_new_comment(){ @Then("the requester should be able to re-open the request and pick up where they left off") def confirm_draft_save_was_successful() { - WebUI.waitForPageLoad(20) - WebUI.verifyTextPresent(request_name, false) +/* WebUI.waitForPageLoad(20) + WebUI.verifyTextPresent(request_name, false)*/ WebUI.closeBrowser() } From ffcc055ee930f82642e31850a9907537958e433a Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 14:53:16 -0800 Subject: [PATCH 067/226] open / delay / close browser test only --- ui_tests/.gitignore | 2 +- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 5 +++-- ui_tests/bin/lib/internal/test.txt | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 ui_tests/bin/lib/internal/test.txt diff --git a/ui_tests/.gitignore b/ui_tests/.gitignore index 8ce403b55..5541515b5 100644 --- a/ui_tests/.gitignore +++ b/ui_tests/.gitignore @@ -4,6 +4,6 @@ ReportFolder/* Profiles/default.glbl .classpath .settings -/bin/ +*.class Libs/TempTest*.groovy Libs/TempTemp*.groovy \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 333510c30..716f857d6 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -57,9 +57,10 @@ class Requester_step_def_ks { @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') + WebUI.delay(5) //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - WebUI.navigateToUrl("http://localhost:8000") + /*WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = new TestObject("app-auth-login-button") loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) WebUI.waitForElementClickable(loginButton, 30) @@ -69,7 +70,7 @@ class Requester_step_def_ks { WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login'))*/ } @Given("requester has started a request") diff --git a/ui_tests/bin/lib/internal/test.txt b/ui_tests/bin/lib/internal/test.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/ui_tests/bin/lib/internal/test.txt @@ -0,0 +1 @@ +test \ No newline at end of file From 77451117ba22ca42aad51481c9e42580ec886c55 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 15:07:30 -0800 Subject: [PATCH 068/226] full Travis script --- .travis.yml | 392 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 391 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index da89a4186..93f893e96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,354 @@ addons: matrix: include: + - name: "Forum Api" + stage: "APIs" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + before_script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + - helm lint helm/forum-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Request Api" + stage: "APIs" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - npm install + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + - helm lint helm/request-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Policy Api" + stage: "APIs" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - helm lint helm/policy-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Validation Api" + stage: "APIs" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - helm lint helm/validate-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Scan - Python" + stage: "Tests" + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1 -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi + + - name: "Scan - NodeJS" + stage: "Tests" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + + - cd /home/travis/build/bcgov/OCWA/frontend + - npm test + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi + + - name: "OCWA Master Helm Chart" + stage: "Tests" + language: node_js + node_js: + - "node" + cache: npm + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa - name: "Integration Tests" stage: "Tests" @@ -117,7 +465,49 @@ matrix: - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" - + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + env: global: - HELM_URL=https://storage.googleapis.com/kubernetes-helm From 7d9f32248d389e9db7c8e73bfb961938ef49e68b Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 15:29:21 -0800 Subject: [PATCH 069/226] fixed yaml syntax error --- .travis.yml | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93f893e96..79efa2915 100644 --- a/.travis.yml +++ b/.travis.yml @@ -465,49 +465,47 @@ matrix: - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" - - name: "Front End" - stage: "Frontend" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ env: global: - HELM_URL=https://storage.googleapis.com/kubernetes-helm From 94917221b1cc786a844cb4a5d15e076b2a4f6635 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 31 Dec 2018 10:47:26 -0800 Subject: [PATCH 070/226] created test files for upload file testing --- .../features/requester/draft_requests.feature | 30 ++-- .../requester/view_request_details.feature | 14 +- .../groovy/Requester_step_def_ks.groovy | 155 ++++++++++-------- ui_tests/Profiles/Travis.glbl | 34 ++-- .../Script1545256102660.groovy | 2 +- ui_tests/bin/lib/internal/test.txt | 1 - ui_tests/testfile1.csv | 4 + ui_tests/testfile2.csv | 4 + 8 files changed, 139 insertions(+), 105 deletions(-) delete mode 100644 ui_tests/bin/lib/internal/test.txt create mode 100644 ui_tests/testfile1.csv create mode 100644 ui_tests/testfile2.csv diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature index cbe142827..681dd4637 100644 --- a/ui_tests/Include/features/requester/draft_requests.feature +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -1,16 +1,16 @@ -Feature: Draft requests -As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once - Background: - Given requester has logged in - Scenario: Save a draft request (no files) - And requester has started a request - But has not submitted the request - When the requester saves their request - Then the requester should be able to re-open the request and pick up where they left off - - Scenario: Save a draft request (with files) - And requester has started a request - And requester add output files to the request - But has not submitted the request - When the requester saves their request +Feature: Draft requests +As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once + Background: + Given requester has logged in + Scenario: Save a draft request (no files) + And requester has started a request + And requester add output files to the request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off + + Scenario: Save a draft request (with files) + And requester has started a request + But has not submitted the request + When the requester saves their request Then the requester should be able to re-open the request and pick up where they left off \ No newline at end of file diff --git a/ui_tests/Include/features/requester/view_request_details.feature b/ui_tests/Include/features/requester/view_request_details.feature index d7ad2b06b..79f4a2669 100644 --- a/ui_tests/Include/features/requester/view_request_details.feature +++ b/ui_tests/Include/features/requester/view_request_details.feature @@ -1,7 +1,7 @@ -Feature: View request details -As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions - Scenario: View details of a request - Given requester has logged in - And the requester has submitted a request - When the requester views the request - Then the requester should see the complete record of the request (including export files, supporting files/text, discussion, and status changes) \ No newline at end of file +Feature: View request details +As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions + Scenario: View details of a request + Given requester has logged in + And the requester has submitted a request + When the requester views the request + Then the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 716f857d6..689aa3774 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -59,8 +59,8 @@ class Requester_step_def_ks { WebUI.openBrowser('') WebUI.delay(5) - //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - /*WebUI.navigateToUrl("http://localhost:8000") + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + //WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = new TestObject("app-auth-login-button") loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) WebUI.waitForElementClickable(loginButton, 30) @@ -70,13 +70,13 @@ class Requester_step_def_ks { WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login'))*/ + WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } @Given("requester has started a request") def requester_starts_new_request() { - /*newRequestButtonObject = new TestObject("new-request-button") + newRequestButtonObject = new TestObject("new-request-button") newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) WebUI.waitForPageLoad(30) @@ -86,7 +86,7 @@ class Requester_step_def_ks { WebUI.click(newRequestButtonObject) request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) - WebUI.delay(2)*/ + WebUI.delay(2) } @Given("has not submitted the request") @@ -96,74 +96,91 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { - /*TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") + TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, "request-form-save-files-button", true) WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) TestObject uploadFileButton = new TestObject("fileUploadButton") - uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true)*/ - //WebUI.sendKeys(uploadFileButton, "C:\\\\Users\\PaulR\\\\Documents\\\\2 - Metadata\\\\HAS project\\\\hospital_visits_bc_2017.csv") - //WebUI.sendKeys(uploadFileButton, findTestData('TestFile1')) - //WebUI.sendKeys(uploadFileButton, '/Data Files/TestFile1')) - //WebUI.delay(5) + uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true) + WebUI.sendKeys(uploadFileButton, GlobalVariable.TestFile1Path.toString()) + + WebUI.delay(5) + + } + + @Given("the output files do not violate any blocking rules") + def output_files_do_not_violate_blocking_rules(){} + + @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") + def requester_affirms_output_is_safe() { + } + + @Given("the requester has submitted a request") + def request_has_submitted_a_request(){ + requester_starts_new_request() + requester_adds_output_files() + requester_submits_request() } -@Given("the output files do not violate any blocking rules") -def output_files_do_not_violate_blocking_rules(){} - -@Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") -def requester_affirms_output_is_safe() { -} - -@Given("requester has a submitted request") -def request_has_submitted_a_request(){ - requester_starts_new_request() - requester_adds_output_files() - requester_submits_request() -} - -@Given("the request has been claimed by an output checker") -def request_has_been_claimed_by_a_oc(){} - -@When("the requester saves their request") -def requester_saves_new_request() { - /*requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - WebUI.click(requestFormSaveCloseButtonObject)*/ -} - -@When("requester submits their request") -def requester_submits_request() { - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) -} - -@When("requester writes and submits a new comment") -def requester_creates_a_new_comment(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) - - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') -} - -@Then("the requester should be able to re-open the request and pick up where they left off") -def confirm_draft_save_was_successful() { -/* WebUI.waitForPageLoad(20) - WebUI.verifyTextPresent(request_name, false)*/ - WebUI.closeBrowser() -} - -@Then("the requester's request is put in awaiting review") -def confirm_request_is_in_awaiting_review_state(){ - WebUI.verifyTextPresent("Awaiting review", false) - WebUI.closeBrowser() -} - -@Then("the requester should not be able to submit the request") -def requester_is_not_able_to_submit_request(){ - WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) - WebUI.closeBrowser() -} + @Given("the request has been claimed by an output checker") + def request_has_been_claimed_by_a_oc(){} + + @When("the requester saves their request") + def requester_saves_new_request() { + requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + WebUI.click(requestFormSaveCloseButtonObject) + } + + @When("requester submits their request") + def requester_submits_request() { + TestObject requestFormSaveButtonObject = new TestObject("request-form-save-close-button") + requestFormSaveButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-button", true) + WebUI.click(requestFormSaveButtonObject) + WebUI.delay(5) + WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + WebUI.delay(3) + } + + @When("requester writes and submits a new comment") + def requester_creates_a_new_comment(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) + + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') + } + + @When("the requester views the request") + def requester_views_request_they_created(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + } + + @Then("the requester should be able to re-open the request and pick up where they left off") + def confirm_draft_save_was_successful() { + WebUI.waitForPageLoad(20) + WebUI.verifyTextPresent(request_name, false) + WebUI.closeBrowser() + } + + @Then("the requester's request is put in awaiting review") + def confirm_request_is_in_awaiting_review_state(){ + WebUI.verifyTextPresent("Awaiting review", false) + WebUI.closeBrowser() + } + + @Then("the requester should not be able to submit the request") + def requester_is_not_able_to_submit_request(){ + WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + WebUI.closeBrowser() + } + + @Then("the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes") + def submitted_request_info_matches_what_was_submitted(){ + WebUI.delay(5) + WebUI.closeBrowser() + } } \ No newline at end of file diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index feb3f8808..8904fd6f4 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -1,12 +1,22 @@ - - - - Travis - - false - - - 'http://localhost:8000' - OCWA_URL - - + + + + Travis + + false + + + 'http://localhost:8000' + OCWA_URL + + + + '/home/travis/build/bcgov/OCWA/ui_tests/testfile1.csv' + TestFile1Path + + + + '/home/travis/build/bcgov/OCWA/ui_tests/testfile2.csv' + TestFile2Path + + diff --git a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy index 06baecc91..12a0ad242 100644 --- a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy +++ b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy @@ -17,5 +17,5 @@ CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') not_run: CucumberKW.runFeatureFile('Include/features/requester/create_a_new_request.feature') -//WebUI.uploadFile(findTestObject(null), findTestData('TestFile1').getValue(1, 1)) +not_run: CucumberKW.runFeatureFile('Include/features/requester/view_request_details.feature') diff --git a/ui_tests/bin/lib/internal/test.txt b/ui_tests/bin/lib/internal/test.txt deleted file mode 100644 index 30d74d258..000000000 --- a/ui_tests/bin/lib/internal/test.txt +++ /dev/null @@ -1 +0,0 @@ -test \ No newline at end of file diff --git a/ui_tests/testfile1.csv b/ui_tests/testfile1.csv new file mode 100644 index 000000000..40599af91 --- /dev/null +++ b/ui_tests/testfile1.csv @@ -0,0 +1,4 @@ +Project Entity ID,Accident type,Accident Date +3d3bc539-9aec-45e0-96a3-4e851068d5e2,motor vehicle,2/26/2018 +2fc94c19-78d8-42a4-8e1a-0d8103340c72,recreational sport,3/15/2018 +a4832b32-25ac-41fc-96ca-7be5753b98b8,motor vehicle,4/22/2018 diff --git a/ui_tests/testfile2.csv b/ui_tests/testfile2.csv new file mode 100644 index 000000000..499fa65bc --- /dev/null +++ b/ui_tests/testfile2.csv @@ -0,0 +1,4 @@ +Project Entity ID,Hospital Number,Fiscal Year,Province Issuing Health Care Number,Gender,Age in Years,Local Health Area,Triage date/time,Triage Level,Registration Date/Time,Physician Initial Assessment Date/Time,Disposition Date/Time +3d3bc539-9aec-45e0-96a3-4e851068d5e2,111,2017,BC,M,23,Victoria,2017-10-20T21:32:52,5,2018-02-26T21:32:52,2018-02-26T23:32:52,2018-02-26T23:32:52 +a4832b32-25ac-41fc-96ca-7be5753b98b8,121,2017,BC,F,47,Kelowna,2017-11-26T21:32:53,4,2018-02-26T21:32:53,2018-02-26T23:32:53,2018-02-26T23:32:53 +2fc94c19-78d8-42a4-8e1a-0d8103340c72,134,2017,BC,F,62,Vancouver,2017-12-23T21:32:54,5,2018-02-26T21:32:54,2018-02-26T23:32:54,2018-02-26T23:32:54 From 95cd0f799e5a63ae284d36ca43a48b08319996d1 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 2 Jan 2019 13:20:58 -0800 Subject: [PATCH 071/226] built out test cases / refactored code --- .../requester/canceling_request.feature | 17 +- .../requester/create_a_new_request.feature | 74 +++--- .../edit_previously_submitted_request.feature | 16 +- .../features/requester/notifications.feature | 44 ++-- .../requester/request_discussion.feature | 28 +- .../requester/see_requests_by_status.feature | 34 +-- .../requester/view_request_details.feature | 3 +- .../requester/withdrawing_request.feature | 12 + .../groovy/Requester_step_def_ks.groovy | 243 +++++++++++++++--- .../random_test_request_name.groovy | 2 +- ui_tests/Libs/internal/GlobalVariable.groovy | 16 +- .../input_Password_login.rs | 2 +- .../input_Password_password.rs | 2 +- .../input_Username or email_userna.rs | 2 +- .../span_Cancelled.rs | 72 ++++++ .../span_Denied.rs | 72 ++++++ .../span_Draft.rs | 72 ++++++ .../span_Flagged.rs | 72 ++++++ .../span_Login.rs | 54 ++++ .../span_QueuedIn Review.rs | 72 ++++++ ui_tests/Profiles/Travis.glbl | 13 +- 21 files changed, 765 insertions(+), 157 deletions(-) create mode 100644 ui_tests/Include/features/requester/withdrawing_request.feature create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Cancelled.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Denied.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Draft.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Flagged.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Login.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_QueuedIn Review.rs diff --git a/ui_tests/Include/features/requester/canceling_request.feature b/ui_tests/Include/features/requester/canceling_request.feature index a54c7dbbb..f1a758918 100644 --- a/ui_tests/Include/features/requester/canceling_request.feature +++ b/ui_tests/Include/features/requester/canceling_request.feature @@ -1,7 +1,12 @@ -Feature: Canceling a request -As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed - Scenario: Cancel a request - Given requester has logged in - And requester has a request that is "Awaiting review" or "Review in progress" - When the requester cancels the request +Feature: Canceling a request +As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed + Scenario: Cancel a request that is awaiting review + Given requester has logged in + And requester has a request of status "Awaiting review" + When the requester cancels the request + Then the request status is changed to "Work in Progress" + Scenario: Cancel a request that is in the process of being reviewed + Given requester has logged in + And requester has a request of status "Review in progress" + When the requester cancels the request Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui_tests/Include/features/requester/create_a_new_request.feature b/ui_tests/Include/features/requester/create_a_new_request.feature index 3b4fdc527..edb22a6f3 100644 --- a/ui_tests/Include/features/requester/create_a_new_request.feature +++ b/ui_tests/Include/features/requester/create_a_new_request.feature @@ -1,39 +1,37 @@ -Feature: create a new request - As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment - Background: - Given requester has logged in - And requester has started a request - And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge - Scenario: A valid request - Given the output files do not violate any blocking rules - When requester submits their request - Then the requester's request is put in awaiting review - Scenario: A request has no data - Given requester does not provide any data they wish to export - When requester submits their request - Then the requester should not be able to submit the request - - Scenario Outline: A request violates blocking rule - Given a request violates blocking rule: - When requester submits their request - Then requester should not be able to submit the request - And the requester should be informed that has been violated - - Examples: - | blocking_rule | - | A request that has a file that is too big | - | The summation of all export file sizes exceeds the request file size limit | - | An export file has a blocked file extension | - | A request has a file with a StudyID in it | - - Scenario Outline: A request violates warning rule - Given a request violates blocking rule: - When requester submits their request - Then requester should be able to submit the request - And the requester should be informed that has been violated - - Examples: - | warning_rule | - | A request that has a file that exceeds the file size warning threshold | - | The summation of all export file sizes exceeds the request file size warning threshold | +Feature: create a new request + As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment + Background: + Given requester has logged in + And requester has started a request + And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge + Scenario: A valid request + Given the output files do not violate any blocking rules + When requester submits their request + Then the request status is changed to "Awaiting review" + Scenario: A request has no data + Then the requester should not be able to submit the request + + Scenario Outline: A request violates blocking rule + Given request violates given blocking rule + When requester submits their request + Then the requester should not be able to submit the request + And requester should be informed that given blocking rule has been violated + + Examples: + | blocking_rule | + | A request that has a file that is too big | + | The summation of all export file sizes exceeds the request file size limit | + | An export file has a blocked file extension | + | A request has a file with a StudyID in it | + + Scenario Outline: A request violates warning rule + Given request violates given warning rule + When requester submits their request + Then the requester should be able to submit the request + And requester should be informed that given warning rule has been violated + + Examples: + | warning_rule | + | A request that has a file that exceeds the file size warning threshold | + | The summation of all export file sizes exceeds the request file size warning threshold | | An export file has a warning file extension | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature index 05dcde51b..37f532ae2 100644 --- a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature +++ b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature @@ -1,8 +1,8 @@ -Feature: edit a previously submitted request -As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request - Scenario: Edit a request that has been reviewed by an output checker and needs revisions - Given requester has logged in - And requester the request is "Work in Progress" - When the requester views the request - Then the requester should be able to make changes to the request - And re-submit the request \ No newline at end of file +Feature: edit a previously submitted request +As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request + Scenario: Edit a request that has been reviewed by an output checker and needs revisions + Given requester has logged in + And requester has a request of status "Work in Progress" + When the requester views the request + Then requester should be able to make changes to the request + And requester should be able to re-submit the request \ No newline at end of file diff --git a/ui_tests/Include/features/requester/notifications.feature b/ui_tests/Include/features/requester/notifications.feature index e0c0df1fd..375deef8f 100644 --- a/ui_tests/Include/features/requester/notifications.feature +++ b/ui_tests/Include/features/requester/notifications.feature @@ -1,23 +1,23 @@ -Feature: Notifications -As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action - - Scenario Outline: requester notifications - Given requester has a submitted request - When occurs - Then the requester should receive an email notifying them of the - But the email should not contain specifics of the request - Examples: - | event | - | output checker makes a comment on the request | - | output checker approves the request | - | output checker requests revisions the request | - - Scenario Outline: output checker notifications - Given an output checker has currently claimed a request - When occurs - Then the output checker should receive an email notifying them of the - But the email should not contain specifics of the request - Examples: - | event | - | requester makes a comment on the request | +Feature: Notifications +As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action + + Scenario Outline: requester notifications + Given requester has submitted a request + When occurs + Then the requester should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | output checker makes a comment on the request | + | output checker approves the request | + | output checker requests revisions the request | + + Scenario Outline: output checker notifications + Given an output checker has currently claimed a request + When occurs + Then the output checker should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | requester makes a comment on the request | | requester re-submits a request | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/request_discussion.feature b/ui_tests/Include/features/requester/request_discussion.feature index f6aff55b7..52e50d7c3 100644 --- a/ui_tests/Include/features/requester/request_discussion.feature +++ b/ui_tests/Include/features/requester/request_discussion.feature @@ -1,15 +1,15 @@ -Feature: Discussion about a request - As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request - As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request - Scenario: requester adds a new comment about request - Given requester has logged in - And requester has a submitted request - And the request has been claimed by an output checker - When requester writes and submits a new comment - Then the requester should see their new comment displayed - And the output checker assigned to the request should be notified of the new comment - Scenario: Output checker adds a new comment about request - Given output checker has logged in - When output checker writes and submits a new comment - Then the output checker should see their new comment displayed +Feature: Discussion about a request + As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request + As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request + Scenario: requester adds a new comment about request + Given requester has logged in + And requester has submitted a request + And the request has been claimed by an output checker + When requester writes and submits a new comment + Then requester should see their new comment displayed + And the output checker assigned to the request should be notified of the new comment + Scenario: Output checker adds a new comment about request + Given output checker has logged in + When output checker writes and submits a new comment + Then the output checker should see their new comment displayed And the requester(s) associated to the request should be notified of the new comment \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_requests_by_status.feature b/ui_tests/Include/features/requester/see_requests_by_status.feature index 14c8c5bc5..e011181c0 100644 --- a/ui_tests/Include/features/requester/see_requests_by_status.feature +++ b/ui_tests/Include/features/requester/see_requests_by_status.feature @@ -1,18 +1,18 @@ -Feature: See requester's requests by status -As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review - Scenario Outline: View requests - Given requester has logged in - And the requester has an request - And request was last updated within the last month - When requester views requests - Then requests should be displayed - But requests with updates older than a month should not be displayed - - Examples: - | status | filter | - | Approved | Approved | - | Revisions required | Draft | - | Awaiting review | Submitted | - | Review in progress | Submitted | - | Draft | Draft | +Feature: See requester's requests by status +As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review + Scenario Outline: View requests + Given requester has logged in + And requester has a request of status "" + And request was last updated within the last month + When requester views requests + Then requests of status "" should be displayed + But requests with updates older than a month should not be displayed + + Examples: + | status | filter | + | Approved | Approved | + | Revisions required | Draft | + | Awaiting review | Submitted | + | Review in progress | Submitted | + | Draft | Draft | | Work in progress | Draft | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/view_request_details.feature b/ui_tests/Include/features/requester/view_request_details.feature index 79f4a2669..99b7a7944 100644 --- a/ui_tests/Include/features/requester/view_request_details.feature +++ b/ui_tests/Include/features/requester/view_request_details.feature @@ -2,6 +2,7 @@ Feature: View request details As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions Scenario: View details of a request Given requester has logged in - And the requester has submitted a request + And requester has submitted a request + And requester writes and submits a new comment When the requester views the request Then the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes \ No newline at end of file diff --git a/ui_tests/Include/features/requester/withdrawing_request.feature b/ui_tests/Include/features/requester/withdrawing_request.feature new file mode 100644 index 000000000..1fbbf2107 --- /dev/null +++ b/ui_tests/Include/features/requester/withdrawing_request.feature @@ -0,0 +1,12 @@ +Feature: Withdrawing a request +As an requester I want to be able to withdraw my request so that I can let checkers know that my request is no longer something I want reviewed + Scenario: Withdraw a request that is awaiting review + Given requester has logged in + And requester has a request of status "Awaiting review" + When the requester withdraws the request + Then the request status is changed to "Work in Progress" + Scenario: Withdraw a request that is in the process of being reviewed + Given requester has logged in + And requester has a request of status "Review in progress" + When the requester withdraws the request + Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 689aa3774..ad86d2801 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -47,10 +47,28 @@ import cucumber.api.java.en.When class Requester_step_def_ks { - String request_name = '' - TestObject newRequestButtonObject = null - TestObject requestFormSaveCloseButtonObject = null - + final String TEST_COMMENT = "test" + final String PURPOSE_TEXT = "The purpose of my project is X" + final String EDITED_PURPOSE_TEXT = "Edited the purpose to be Y" + final String REQUEST_PATH = "/requests/" + final String LOGIN_BTN_ID = "app-auth-login-button" + final String LOGIN_USERNAME = "pripley" + final String LOGIN_PWD = "EUKVYWz2orI=" + final String NEW_REQUEST_BTN_ID = "new-request-button" + final String REQUEST_SAVE_FILES_BTN_ID = "request-form-save-files-button" + final String REQUEST_FILES_UPLOAD_BTN_ID = "file-uploader-input" + final String REQUEST_SAVE_BTN_ID = "request-form-save-button" + final String REQUEST_SAVE_CLOSE_BTN_ID = "request-form-save-close-button" + final String REQUEST_EDIT_BTN_ID = "request-sidebar-edit-button" + final String REQUEST_PURPOSE_TXT_ID = "purpose" + final String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" + final String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" + + String g_requestName = "" + TestObject g_newRequestButtonObject = null + TestObject g_requestFormSaveCloseButtonObject = null + String g_fileToUpload = "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name" + /** * The step definitions below match with Katalon sample Gherkin steps */ @@ -61,14 +79,14 @@ class Requester_step_def_ks { WebUI.navigateToUrl(GlobalVariable.OCWA_URL) //WebUI.navigateToUrl("http://localhost:8000") - TestObject loginButton = new TestObject("app-auth-login-button") - loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) + TestObject loginButton = new TestObject(LOGIN_BTN_ID) + loginButton.addProperty("id", ConditionType.EQUALS, LOGIN_BTN_ID, true) WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) - WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), LOGIN_USERNAME) - WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), LOGIN_PWD) WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } @@ -76,16 +94,21 @@ class Requester_step_def_ks { @Given("requester has started a request") def requester_starts_new_request() { - newRequestButtonObject = new TestObject("new-request-button") - newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + g_newRequestButtonObject = new TestObject(NEW_REQUEST_BTN_ID) + g_newRequestButtonObject.addProperty("id", ConditionType.EQUALS, NEW_REQUEST_BTN_ID, true) + + TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) + purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) WebUI.waitForPageLoad(30) WebUI.delay(5) - WebUI.waitForElementClickable(newRequestButtonObject, 30) - WebUI.click(newRequestButtonObject) - request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + WebUI.waitForElementClickable(g_newRequestButtonObject, 30) + WebUI.click(g_newRequestButtonObject) + g_requestName = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), g_requestName) + + WebUI.setText(purposeTextbox, PURPOSE_TEXT) WebUI.delay(2) } @@ -96,13 +119,13 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { - TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") - requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, "request-form-save-files-button", true) + TestObject requestFormSaveFilesButton = new TestObject(REQUEST_SAVE_FILES_BTN_ID) + requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_FILES_BTN_ID, true) WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) - TestObject uploadFileButton = new TestObject("fileUploadButton") - uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true) - WebUI.sendKeys(uploadFileButton, GlobalVariable.TestFile1Path.toString()) + TestObject uploadFileButton = new TestObject(REQUEST_FILES_UPLOAD_BTN_ID) + uploadFileButton.addProperty("id", ConditionType.EQUALS, REQUEST_FILES_UPLOAD_BTN_ID, true) + WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name") WebUI.delay(5) @@ -110,34 +133,84 @@ class Requester_step_def_ks { @Given("the output files do not violate any blocking rules") def output_files_do_not_violate_blocking_rules(){} + + @Given("request violates given warning rule (.+)") + def request_violates_warning_rule(String warningRule){ +// switch (warningRule) { +// case "": +// +// break +// } + } + @Given("request violates given blocking rule (.+)") + def request_violates_blocking_rule(String blockingRule){ +// switch (blockingRule) { +// case "": +// +// break +// } + } @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") def requester_affirms_output_is_safe() { } - @Given("the requester has submitted a request") - def request_has_submitted_a_request(){ + @Given("requester has submitted a request") + def requester_has_submitted_a_request(){ requester_starts_new_request() requester_adds_output_files() requester_submits_request() } + + @Given("request was last updated within the last month") + def request_updated_within_last_month() {} @Given("the request has been claimed by an output checker") - def request_has_been_claimed_by_a_oc(){} + def request_has_been_claimed_by_a_oc(){ + //request_is_review_in_progress() + requester_has_a_request_of_status("Review in progress") + } + + @Given('requester has a request of status "(.+)"') + def requester_has_a_request_of_status(String status) { + switch (status) { + case "Draft": + requester_starts_new_request() + requester_adds_output_files() + requester_saves_new_request() + break + case "Awaiting review": + requester_has_submitted_a_request() + break + case "Review in progress": + requester_has_submitted_a_request() + //output checker needs to claim + break + case "Work in progress": + requester_has_submitted_a_request() + requester_withdraws_request() + break + case "Approved": + requester_has_submitted_a_request() + //output checker needs to claim + //output checker needs to approve + break + } + } @When("the requester saves their request") def requester_saves_new_request() { - requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - WebUI.click(requestFormSaveCloseButtonObject) + g_requestFormSaveCloseButtonObject = new TestObject(REQUEST_SAVE_CLOSE_BTN_ID) + g_requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_CLOSE_BTN_ID, true) + WebUI.click(g_requestFormSaveCloseButtonObject) } @When("requester submits their request") def requester_submits_request() { - TestObject requestFormSaveButtonObject = new TestObject("request-form-save-close-button") - requestFormSaveButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-button", true) + TestObject requestFormSaveButtonObject = new TestObject(REQUEST_SAVE_BTN_ID) + requestFormSaveButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_BTN_ID, true) WebUI.click(requestFormSaveButtonObject) - WebUI.delay(5) + WebUI.delay(15) WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) WebUI.delay(3) @@ -145,30 +218,54 @@ class Requester_step_def_ks { @When("requester writes and submits a new comment") def requester_creates_a_new_comment(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) - + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) - + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), TEST_COMMENT) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) - - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') } @When("the requester views the request") def requester_views_request_they_created(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") } + + @When("the requester cancels the request") + def requester_cancels_request(){ + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + TestObject cancelButtonObject = new TestObject(REQUEST_CANCEL_BTN_ID) + cancelButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_CANCEL_BTN_ID, true) + WebUI.click(cancelButtonObject) + } + + @When("the requester withdraws the request") + def requester_withdraws_request(){ + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + TestObject withdrawButtonObject = new TestObject(REQUEST_WITHDRAW_BTN_ID) + withdrawButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_WITHDRAW_BTN_ID, true) + WebUI.click(withdrawButtonObject) + } + + @When("requester views (.+) requests") + def requester_views_requests_of_given_status(String status){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + switch (status) { + case "Draft": + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Draft')) + break + case "Submitted": + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_QueuedIn Review')) + break + case "Approved": + //stub for when a filter for approved requests is added to UI + break + } + } + @Then("the requester should be able to re-open the request and pick up where they left off") def confirm_draft_save_was_successful() { WebUI.waitForPageLoad(20) - WebUI.verifyTextPresent(request_name, false) - WebUI.closeBrowser() - } - - @Then("the requester's request is put in awaiting review") - def confirm_request_is_in_awaiting_review_state(){ - WebUI.verifyTextPresent("Awaiting review", false) + WebUI.verifyTextPresent(g_requestName, false) WebUI.closeBrowser() } @@ -178,9 +275,73 @@ class Requester_step_def_ks { WebUI.closeBrowser() } + @Then("the requester should be able to submit the request") + def requester_is_able_to_submit_request(){ + WebUI.verifyElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + WebUI.closeBrowser() + } + @Then("the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes") def submitted_request_info_matches_what_was_submitted(){ + WebUI.verifyTextPresent(GlobalVariable.TestFile1Path.toString(), false) + WebUI.verifyTextPresent(g_requestName, false) + WebUI.verifyTextPresent(g_purpose, false) + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + WebUI.delay(2) + //WebUI.verifyTextPresent(TEST_COMMENT, false) + requester_should_see_their_new_comment_displayed() WebUI.delay(5) WebUI.closeBrowser() } + + @Then('the request status is changed to "(.+)"') + def request_should_be_in_given_status(String status){ + //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + WebUI.verifyTextPresent(status, false) + WebUI.closeBrowser() + } + + @Then('requests of status "(.+)" should be displayed') + def requests_of_given_status_should_be_displayed(String status){ + WebUI.verifyTextPresent(g_requestName, false) + WebUI.closeBrowser() + } + + @Then("requests with updates older than a month should not be displayed") + def no_old_requests_should_be_displayed(){} + + @Then("requester should see their new comment displayed") + def requester_should_see_their_new_comment_displayed(){ + WebUI.verifyTextPresent(TEST_COMMENT, false) + } + + @Then("requester should be able to make changes to the request") + def requester_should_be_able_to_make_changes_to_the_request(){ + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + TestObject editButtonObject = new TestObject("edit-button") + editButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_EDIT_BTN_ID, true) + WebUI.click(editButtonObject) + TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) + purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) + WebUI.setText(purposeTextbox, EDITED_PURPOSE_TEXT) + } + @Then("requester should be able to re-submit the request") + def requester_should_be_able_to_resubmit_request(){ + WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + WebUI.delay(5) + request_should_be_in_given_status("Review in progress") + WebUI.closeBrowser() + } + + @Then("requester should be informed that given blocking rule (.+) has been violated") + def request_should_be_informed_of_blocking_rule_violation(){ + //unclear how this is displayed in the UI + } + + @Then("requester should be informed that given warning rule (.+) has been violated") + def request_should_be_informed_of_warning_rule_violation(){ + //unclear how this is displayed in the UI + } + } \ No newline at end of file diff --git a/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy index c63222c61..ea41488a8 100644 --- a/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy +++ b/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -24,6 +24,6 @@ public class random_test_request_name { def gen_random_test_request_name() { Date today = new Date() String todaysDate = today.format('MMddyy-hhmm-ss') - return 'auto_eng ' + todaysDate + return 'auto_eng' + todaysDate } } \ No newline at end of file diff --git a/ui_tests/Libs/internal/GlobalVariable.groovy b/ui_tests/Libs/internal/GlobalVariable.groovy index 51b9af8e5..7865384f0 100644 --- a/ui_tests/Libs/internal/GlobalVariable.groovy +++ b/ui_tests/Libs/internal/GlobalVariable.groovy @@ -18,16 +18,28 @@ public class GlobalVariable { */ public static Object OCWA_URL + /** + *

+ */ + public static Object TestFile1Path + + /** + *

+ */ + public static Object TestFile2Path + static { def allVariables = [:] - allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca']) - allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) + allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca', 'TestFile1Path' : 'C:\\\\\\\\Users\\\\PaulR\\\\\\\\Documents\\\\\\\\2 - Metadata\\\\\\\\HAS project\\\\\\\\hospital_visits_bc_2017.csv', 'TestFile2Path' : 'C:\\\\\\\\Users\\\\PaulR\\\\\\\\Documents\\\\\\\\2 - Metadata\\\\\\\\HAS project\\\\\\\\sports_accidents_bc_2017.csv']) + allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000', 'TestFile1Path' : '/home/travis/build/bcgov/OCWA/ui_tests/testfile1.csv', 'TestFile2Path' : '/home/travis/build/bcgov/OCWA/ui_tests/testfile2.csv']) String profileName = RunConfiguration.getExecutionProfile() def selectedVariables = allVariables[profileName] OCWA_URL = selectedVariables['OCWA_URL'] + TestFile1Path = selectedVariables['TestFile1Path'] + TestFile2Path = selectedVariables['TestFile2Path'] } } diff --git a/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs index e4f34d42a..cfcccdc89 100644 --- a/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs @@ -10,7 +10,7 @@ //input[@id='kc-login'] - BASIC + XPATH false true diff --git a/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs index 4b818c9f3..87dae4354 100644 --- a/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs @@ -10,7 +10,7 @@ //input[@id='password'] - BASIC + XPATH false true diff --git a/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs index 6f517919f..1b9d94834 100644 --- a/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs @@ -10,7 +10,7 @@ //input[@id='username'] - BASIC + XPATH false true diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Cancelled.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Cancelled.rs new file mode 100644 index 000000000..5edb379ef --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Cancelled.rs @@ -0,0 +1,72 @@ + + + + span_Cancelled + + 67dcebb3-f537-46fb-b692-3e736a0cdef4 + + + XPATH + //nav[@id='requests-list-filters']/div/div[6]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Cancelled + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[6]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Status'])[1]/preceding::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Request Identifier'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[6]/button/span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Denied.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Denied.rs new file mode 100644 index 000000000..66da5d33b --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Denied.rs @@ -0,0 +1,72 @@ + + + + span_Denied + + beff2871-1fd7-4986-949c-e0aeeb041319 + + + XPATH + //nav[@id='requests-list-filters']/div/div[5]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Denied + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[5]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancelled'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Status'])[1]/preceding::span[4] + + + false + equals + xpath:position + //div[5]/button/span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Draft.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Draft.rs new file mode 100644 index 000000000..fe12b2600 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Draft.rs @@ -0,0 +1,72 @@ + + + + span_Draft + + eed336c2-2db7-4c7b-9b95-2e5ca8f147ec + + + XPATH + //nav[@id='requests-list-filters']/div/div[2]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Draft + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[2]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[2]/button/span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Flagged.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Flagged.rs new file mode 100644 index 000000000..8b563a242 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Flagged.rs @@ -0,0 +1,72 @@ + + + + span_Flagged + + 3d8643ef-b121-486d-ac62-00a94ea7e89a + + + XPATH + //nav[@id='requests-list-filters']/div/div[4]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Flagged + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[4]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancelled'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[4]/button/span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Login.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Login.rs new file mode 100644 index 000000000..ec9e5f3a7 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Login.rs @@ -0,0 +1,54 @@ + + + + span_Login + + 0766ca22-31d9-4634-a0fc-7c54a2edd801 + + + XPATH + //a[@id='app-auth-login-button']/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Login + + + false + equals + xpath + Main + id("app-auth-login-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //a[@id='app-auth-login-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] + + + false + equals + xpath:position + //span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_QueuedIn Review.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_QueuedIn Review.rs new file mode 100644 index 000000000..227bc5f70 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_QueuedIn Review.rs @@ -0,0 +1,72 @@ + + + + span_QueuedIn Review + + 0336bccd-6598-481e-a5b0-f01eae35c4da + + + XPATH + //nav[@id='requests-list-filters']/div/div[3]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Queued/In Review + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[3]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[3]/button/span/span + + diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index 8904fd6f4..0705adce4 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -11,12 +11,17 @@ - '/home/travis/build/bcgov/OCWA/ui_tests/testfile1.csv' - TestFile1Path + '/home/travis/build/bcgov/OCWA/ui_tests/' + TestFilePath - '/home/travis/build/bcgov/OCWA/ui_tests/testfile2.csv' - TestFile2Path + 'testfile1.csv' + TestFile1Name + + + + 'testfile2.csv' + TestFile2Name From e5fc27d0ed311562cb6a75955df43495691adf91 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 2 Jan 2019 15:22:01 -0800 Subject: [PATCH 072/226] fixed WIP bug --- .../features/requester/draft_requests.feature | 4 +- .../edit_previously_submitted_request.feature | 2 +- .../groovy/Requester_step_def_ks.groovy | 99 ++++++++++--------- ui_tests/Profiles/Travis.glbl | 2 +- ui_tests/test_small_file_size_limit.txt | 0 5 files changed, 56 insertions(+), 51 deletions(-) create mode 100644 ui_tests/test_small_file_size_limit.txt diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature index 681dd4637..4a53d6fb1 100644 --- a/ui_tests/Include/features/requester/draft_requests.feature +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -2,14 +2,14 @@ Feature: Draft requests As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once Background: Given requester has logged in - Scenario: Save a draft request (no files) + Scenario: Save a draft request (with files) And requester has started a request And requester add output files to the request But has not submitted the request When the requester saves their request Then the requester should be able to re-open the request and pick up where they left off - Scenario: Save a draft request (with files) + Scenario: Save a draft request (no files) And requester has started a request But has not submitted the request When the requester saves their request diff --git a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature index 37f532ae2..e47b53249 100644 --- a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature +++ b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature @@ -2,7 +2,7 @@ Feature: edit a previously submitted request As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request Scenario: Edit a request that has been reviewed by an output checker and needs revisions Given requester has logged in - And requester has a request of status "Work in Progress" + And requester has a request of status "Work in progress" When the requester views the request Then requester should be able to make changes to the request And requester should be able to re-submit the request \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index ad86d2801..18f4ba70e 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -63,12 +63,12 @@ class Requester_step_def_ks { final String REQUEST_PURPOSE_TXT_ID = "purpose" final String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" final String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" - + String g_requestName = "" TestObject g_newRequestButtonObject = null TestObject g_requestFormSaveCloseButtonObject = null String g_fileToUpload = "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name" - + /** * The step definitions below match with Katalon sample Gherkin steps */ @@ -96,7 +96,7 @@ class Requester_step_def_ks { g_newRequestButtonObject = new TestObject(NEW_REQUEST_BTN_ID) g_newRequestButtonObject.addProperty("id", ConditionType.EQUALS, NEW_REQUEST_BTN_ID, true) - + TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) @@ -107,7 +107,7 @@ class Requester_step_def_ks { WebUI.click(g_newRequestButtonObject) g_requestName = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), g_requestName) - + WebUI.setText(purposeTextbox, PURPOSE_TEXT) WebUI.delay(2) } @@ -128,27 +128,26 @@ class Requester_step_def_ks { WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name") WebUI.delay(5) - } @Given("the output files do not violate any blocking rules") def output_files_do_not_violate_blocking_rules(){} - + @Given("request violates given warning rule (.+)") def request_violates_warning_rule(String warningRule){ -// switch (warningRule) { -// case "": -// -// break -// } + // switch (warningRule.toLowerCase()) { + // case "": + // + // break + // } } @Given("request violates given blocking rule (.+)") def request_violates_blocking_rule(String blockingRule){ -// switch (blockingRule) { -// case "": -// -// break -// } + // switch (blockingRule.toLowerCase()) { + // case "": + // + // break + // } } @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") @@ -161,7 +160,7 @@ class Requester_step_def_ks { requester_adds_output_files() requester_submits_request() } - + @Given("request was last updated within the last month") def request_updated_within_last_month() {} @@ -170,31 +169,34 @@ class Requester_step_def_ks { //request_is_review_in_progress() requester_has_a_request_of_status("Review in progress") } - + @Given('requester has a request of status "(.+)"') def requester_has_a_request_of_status(String status) { - switch (status) { - case "Draft": + switch (status.toLowerCase()) { + case "draft": requester_starts_new_request() requester_adds_output_files() requester_saves_new_request() break - case "Awaiting review": + case "awaiting review": requester_has_submitted_a_request() break - case "Review in progress": + case "review in progress": requester_has_submitted_a_request() - //output checker needs to claim + //output checker needs to claim break - case "Work in progress": + case "work in progress": requester_has_submitted_a_request() requester_withdraws_request() break - case "Approved": + case "approved": requester_has_submitted_a_request() - //output checker needs to claim - //output checker needs to approve - break + //output checker needs to claim + //output checker needs to approve + break + default: + throw new Exception("status $status not found") + break } } @@ -228,7 +230,7 @@ class Requester_step_def_ks { def requester_views_request_they_created(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") } - + @When("the requester cancels the request") def requester_cancels_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") @@ -236,7 +238,7 @@ class Requester_step_def_ks { cancelButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_CANCEL_BTN_ID, true) WebUI.click(cancelButtonObject) } - + @When("the requester withdraws the request") def requester_withdraws_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") @@ -244,27 +246,31 @@ class Requester_step_def_ks { withdrawButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_WITHDRAW_BTN_ID, true) WebUI.click(withdrawButtonObject) } - + @When("requester views (.+) requests") def requester_views_requests_of_given_status(String status){ WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - switch (status) { - case "Draft": - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Draft')) + switch (status.toLowerCase()) { + case "draft": + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Draft')) break - case "Submitted": + case "submitted": WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_QueuedIn Review')) break - case "Approved": + case "approved": //stub for when a filter for approved requests is added to UI - break + break + default: + throw new Exception("status $status not found") + break } } - + @Then("the requester should be able to re-open the request and pick up where they left off") def confirm_draft_save_was_successful() { WebUI.waitForPageLoad(20) + WebUI.delay(5) WebUI.verifyTextPresent(g_requestName, false) WebUI.closeBrowser() } @@ -293,28 +299,28 @@ class Requester_step_def_ks { WebUI.delay(5) WebUI.closeBrowser() } - + @Then('the request status is changed to "(.+)"') def request_should_be_in_given_status(String status){ //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") WebUI.verifyTextPresent(status, false) WebUI.closeBrowser() } - + @Then('requests of status "(.+)" should be displayed') def requests_of_given_status_should_be_displayed(String status){ WebUI.verifyTextPresent(g_requestName, false) WebUI.closeBrowser() } - + @Then("requests with updates older than a month should not be displayed") def no_old_requests_should_be_displayed(){} - + @Then("requester should see their new comment displayed") def requester_should_see_their_new_comment_displayed(){ WebUI.verifyTextPresent(TEST_COMMENT, false) } - + @Then("requester should be able to make changes to the request") def requester_should_be_able_to_make_changes_to_the_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") @@ -322,7 +328,7 @@ class Requester_step_def_ks { editButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_EDIT_BTN_ID, true) WebUI.click(editButtonObject) TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) - purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) + purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) WebUI.setText(purposeTextbox, EDITED_PURPOSE_TEXT) } @Then("requester should be able to re-submit the request") @@ -333,15 +339,14 @@ class Requester_step_def_ks { request_should_be_in_given_status("Review in progress") WebUI.closeBrowser() } - + @Then("requester should be informed that given blocking rule (.+) has been violated") def request_should_be_informed_of_blocking_rule_violation(){ //unclear how this is displayed in the UI } - + @Then("requester should be informed that given warning rule (.+) has been violated") def request_should_be_informed_of_warning_rule_violation(){ //unclear how this is displayed in the UI } - } \ No newline at end of file diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index 0705adce4..2a3c0c03b 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -16,7 +16,7 @@ - 'testfile1.csv' + 'testfile1.txt' TestFile1Name diff --git a/ui_tests/test_small_file_size_limit.txt b/ui_tests/test_small_file_size_limit.txt new file mode 100644 index 000000000..e69de29bb From 6a4bdbe4aa952b72b777a799e595a14d6ac14dc7 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 2 Jan 2019 15:23:03 -0800 Subject: [PATCH 073/226] changed test file extension --- ui_tests/{testfile1.csv => testfile1.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ui_tests/{testfile1.csv => testfile1.txt} (100%) diff --git a/ui_tests/testfile1.csv b/ui_tests/testfile1.txt similarity index 100% rename from ui_tests/testfile1.csv rename to ui_tests/testfile1.txt From 169119d8dc0b0c10d4dd0b340f568e99e3f8392d Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 3 Jan 2019 11:33:38 -0800 Subject: [PATCH 074/226] refactored code; added multiple file upload test support --- .../requester/create_a_new_request.feature | 10 +- .../features/requester/draft_requests.feature | 2 +- .../groovy/Requester_step_def_ks.groovy | 177 ++++++++++-------- ui_tests/Profiles/Travis.glbl | 35 +++- ui_tests/Test Suites/CucumberSuite.ts | 2 +- .../test_files/test_min_file_size_limit.txt | 0 .../test_files/test_study_ids_in_file.txt | 5 + .../test_files/test_valid_file_upload.txt | 4 + .../test_files/test_warning_extension.csv | 4 + 9 files changed, 151 insertions(+), 88 deletions(-) create mode 100644 ui_tests/test_files/test_min_file_size_limit.txt create mode 100644 ui_tests/test_files/test_study_ids_in_file.txt create mode 100644 ui_tests/test_files/test_valid_file_upload.txt create mode 100644 ui_tests/test_files/test_warning_extension.csv diff --git a/ui_tests/Include/features/requester/create_a_new_request.feature b/ui_tests/Include/features/requester/create_a_new_request.feature index edb22a6f3..f639f2555 100644 --- a/ui_tests/Include/features/requester/create_a_new_request.feature +++ b/ui_tests/Include/features/requester/create_a_new_request.feature @@ -5,7 +5,7 @@ Feature: create a new request And requester has started a request And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge Scenario: A valid request - Given the output files do not violate any blocking rules + Given requester adds an output file that does not violate any blocking or warning rules When requester submits their request Then the request status is changed to "Awaiting review" Scenario: A request has no data @@ -20,8 +20,8 @@ Feature: create a new request Examples: | blocking_rule | | A request that has a file that is too big | - | The summation of all export file sizes exceeds the request file size limit | - | An export file has a blocked file extension | + | The summation of all output file sizes exceeds the request file size limit | + | An output file has a blocked file extension | | A request has a file with a StudyID in it | Scenario Outline: A request violates warning rule @@ -33,5 +33,5 @@ Feature: create a new request Examples: | warning_rule | | A request that has a file that exceeds the file size warning threshold | - | The summation of all export file sizes exceeds the request file size warning threshold | - | An export file has a warning file extension | \ No newline at end of file + | The summation of all output file sizes exceeds the request file size warning threshold | + | An output file has a warning file extension | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature index 4a53d6fb1..ecfbb0d1d 100644 --- a/ui_tests/Include/features/requester/draft_requests.feature +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -4,7 +4,7 @@ As an requester I want to be able to save a draft of my request so that I can do Given requester has logged in Scenario: Save a draft request (with files) And requester has started a request - And requester add output files to the request + And requester adds an output file that does not violate any blocking or warning rules But has not submitted the request When the requester saves their request Then the requester should be able to re-open the request and pick up where they left off diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 18f4ba70e..4ffcc9369 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -47,31 +47,30 @@ import cucumber.api.java.en.When class Requester_step_def_ks { - final String TEST_COMMENT = "test" - final String PURPOSE_TEXT = "The purpose of my project is X" - final String EDITED_PURPOSE_TEXT = "Edited the purpose to be Y" - final String REQUEST_PATH = "/requests/" - final String LOGIN_BTN_ID = "app-auth-login-button" - final String LOGIN_USERNAME = "pripley" - final String LOGIN_PWD = "EUKVYWz2orI=" - final String NEW_REQUEST_BTN_ID = "new-request-button" - final String REQUEST_SAVE_FILES_BTN_ID = "request-form-save-files-button" - final String REQUEST_FILES_UPLOAD_BTN_ID = "file-uploader-input" - final String REQUEST_SAVE_BTN_ID = "request-form-save-button" - final String REQUEST_SAVE_CLOSE_BTN_ID = "request-form-save-close-button" - final String REQUEST_EDIT_BTN_ID = "request-sidebar-edit-button" - final String REQUEST_PURPOSE_TXT_ID = "purpose" - final String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" - final String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" - + String TEST_COMMENT = "test" + String PURPOSE_TEXT = "The purpose of my project is X" + String EDITED_PURPOSE_TEXT = "Edited the purpose to be Y" + String REQUEST_PATH = "/requests/" + String LOGIN_BTN_ID = "app-auth-login-button" + String LOGIN_USERNAME = "pripley" + String LOGIN_PWD = "EUKVYWz2orI=" + String NEW_REQUEST_BTN_ID = "new-request-button" + String REQUEST_SAVE_FILES_BTN_ID = "request-form-save-files-button" + String REQUEST_FILES_UPLOAD_BTN_ID = "file-uploader-input" + String REQUEST_SAVE_BTN_ID = "request-form-save-button" + String REQUEST_SAVE_CLOSE_BTN_ID = "request-form-save-close-button" + String REQUEST_EDIT_BTN_ID = "request-sidebar-edit-button" + String REQUEST_PURPOSE_TXT_ID = "purpose" + String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" + String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" + String LOGOUT_URL = "/auth/logout" + String g_requestName = "" - TestObject g_newRequestButtonObject = null - TestObject g_requestFormSaveCloseButtonObject = null - String g_fileToUpload = "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name" - + /** * The step definitions below match with Katalon sample Gherkin steps */ + @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') @@ -79,8 +78,7 @@ class Requester_step_def_ks { WebUI.navigateToUrl(GlobalVariable.OCWA_URL) //WebUI.navigateToUrl("http://localhost:8000") - TestObject loginButton = new TestObject(LOGIN_BTN_ID) - loginButton.addProperty("id", ConditionType.EQUALS, LOGIN_BTN_ID, true) + TestObject loginButton = get_test_object_by_id(LOGIN_BTN_ID) WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) @@ -94,21 +92,17 @@ class Requester_step_def_ks { @Given("requester has started a request") def requester_starts_new_request() { - g_newRequestButtonObject = new TestObject(NEW_REQUEST_BTN_ID) - g_newRequestButtonObject.addProperty("id", ConditionType.EQUALS, NEW_REQUEST_BTN_ID, true) - - TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) - purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) + TestObject newRequestButtonObject = get_test_object_by_id(NEW_REQUEST_BTN_ID) WebUI.waitForPageLoad(30) WebUI.delay(5) - WebUI.waitForElementClickable(g_newRequestButtonObject, 30) - WebUI.click(g_newRequestButtonObject) + WebUI.waitForElementClickable(newRequestButtonObject, 30) + WebUI.click(newRequestButtonObject) g_requestName = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), g_requestName) - WebUI.setText(purposeTextbox, PURPOSE_TEXT) + WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), PURPOSE_TEXT) WebUI.delay(2) } @@ -116,53 +110,87 @@ class Requester_step_def_ks { def requester_has_not_submitted_new_request() { } - @Given("requester add output files to the request") - def requester_adds_output_files() { + def requester_adds_output_file(String fileToUpload, String secondFile="", String thirdFile="") { - TestObject requestFormSaveFilesButton = new TestObject(REQUEST_SAVE_FILES_BTN_ID) - requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_FILES_BTN_ID, true) + TestObject requestFormSaveFilesButton = get_test_object_by_id(REQUEST_SAVE_FILES_BTN_ID) + WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) - TestObject uploadFileButton = new TestObject(REQUEST_FILES_UPLOAD_BTN_ID) - uploadFileButton.addProperty("id", ConditionType.EQUALS, REQUEST_FILES_UPLOAD_BTN_ID, true) - WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name") - + TestObject uploadFileButton = get_test_object_by_id(REQUEST_FILES_UPLOAD_BTN_ID) + + WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$fileToUpload") WebUI.delay(5) + if (secondFile != "") { + WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$secondFile") + WebUI.delay(5) + } + + if (thirdFile != "") { + WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$thirdFile") + WebUI.delay(5) + } } - @Given("the output files do not violate any blocking rules") - def output_files_do_not_violate_blocking_rules(){} + @Given("requester adds an output file that does not violate any blocking or warning rules") + def requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules(){ + requester_adds_output_file(GlobalVariable.ValidFileName) + } @Given("request violates given warning rule (.+)") def request_violates_warning_rule(String warningRule){ - // switch (warningRule.toLowerCase()) { - // case "": - // - // break - // } + requester_starts_new_request() + switch (warningRule.toLowerCase()) { + case "an output file has a warning file extension": + requester_adds_output_file(GlobalVariable.WarningExtensionFileName) + break + case "a request that has a file that exceeds the file size warning threshold": + requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) + break + case "the summation of all output file sizes exceeds the request file size warning threshold": + //need to add output files that pass the warning limit individually but together surpass the combined size threshold + //requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) + break + default: + throw new Exception("warning rule $warningRule not found") + break + } } @Given("request violates given blocking rule (.+)") def request_violates_blocking_rule(String blockingRule){ - // switch (blockingRule.toLowerCase()) { - // case "": - // - // break - // } + requester_starts_new_request() + switch (blockingRule.toLowerCase()) { + case "an output file has a blocked file extension": + requester_adds_output_file(GlobalVariable.BlockedExtensionFileName) + break + case "a request that has a file that is too big": + requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) + break + case "the summation of all output file sizes exceeds the request file size limit": + //need to add output files that pass the blocked limit individually but together surpass the combined size threshold + //requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) + break + default: + throw new Exception("block rule $blockingRule not found") + break + } } @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") def requester_affirms_output_is_safe() { + //stubbed in case we need to check a box in the UI to support this } @Given("requester has submitted a request") def requester_has_submitted_a_request(){ requester_starts_new_request() - requester_adds_output_files() + requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules() requester_submits_request() } @Given("request was last updated within the last month") - def request_updated_within_last_month() {} + def request_updated_within_last_month() { + //stubbed because newly created requests will always have an update date within the last month + } @Given("the request has been claimed by an output checker") def request_has_been_claimed_by_a_oc(){ @@ -175,7 +203,7 @@ class Requester_step_def_ks { switch (status.toLowerCase()) { case "draft": requester_starts_new_request() - requester_adds_output_files() + requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules() requester_saves_new_request() break case "awaiting review": @@ -202,16 +230,12 @@ class Requester_step_def_ks { @When("the requester saves their request") def requester_saves_new_request() { - g_requestFormSaveCloseButtonObject = new TestObject(REQUEST_SAVE_CLOSE_BTN_ID) - g_requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_CLOSE_BTN_ID, true) - WebUI.click(g_requestFormSaveCloseButtonObject) + WebUI.click(get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID)) } @When("requester submits their request") def requester_submits_request() { - TestObject requestFormSaveButtonObject = new TestObject(REQUEST_SAVE_BTN_ID) - requestFormSaveButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_BTN_ID, true) - WebUI.click(requestFormSaveButtonObject) + WebUI.click(get_test_object_by_id(REQUEST_SAVE_BTN_ID)) WebUI.delay(15) WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) @@ -234,19 +258,15 @@ class Requester_step_def_ks { @When("the requester cancels the request") def requester_cancels_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") - TestObject cancelButtonObject = new TestObject(REQUEST_CANCEL_BTN_ID) - cancelButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_CANCEL_BTN_ID, true) - WebUI.click(cancelButtonObject) + WebUI.click(get_test_object_by_id(REQUEST_CANCEL_BTN_ID)) } @When("the requester withdraws the request") def requester_withdraws_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") - TestObject withdrawButtonObject = new TestObject(REQUEST_WITHDRAW_BTN_ID) - withdrawButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_WITHDRAW_BTN_ID, true) - WebUI.click(withdrawButtonObject) + WebUI.click(get_test_object_by_id(REQUEST_WITHDRAW_BTN_ID)) } - + @When("requester views (.+) requests") def requester_views_requests_of_given_status(String status){ WebUI.navigateToUrl(GlobalVariable.OCWA_URL) @@ -260,7 +280,7 @@ class Requester_step_def_ks { case "approved": //stub for when a filter for approved requests is added to UI break - default: + default: throw new Exception("status $status not found") break } @@ -272,6 +292,7 @@ class Requester_step_def_ks { WebUI.waitForPageLoad(20) WebUI.delay(5) WebUI.verifyTextPresent(g_requestName, false) + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$LOGOUT_URL") WebUI.closeBrowser() } @@ -289,9 +310,9 @@ class Requester_step_def_ks { @Then("the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes") def submitted_request_info_matches_what_was_submitted(){ - WebUI.verifyTextPresent(GlobalVariable.TestFile1Path.toString(), false) + WebUI.verifyTextPresent(GlobalVariable.ValidFileName, false) WebUI.verifyTextPresent(g_requestName, false) - WebUI.verifyTextPresent(g_purpose, false) + WebUI.verifyTextPresent(PURPOSE_TEXT, false) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) WebUI.delay(2) //WebUI.verifyTextPresent(TEST_COMMENT, false) @@ -324,12 +345,8 @@ class Requester_step_def_ks { @Then("requester should be able to make changes to the request") def requester_should_be_able_to_make_changes_to_the_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") - TestObject editButtonObject = new TestObject("edit-button") - editButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_EDIT_BTN_ID, true) - WebUI.click(editButtonObject) - TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) - purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) - WebUI.setText(purposeTextbox, EDITED_PURPOSE_TEXT) + WebUI.click(get_test_object_by_id(REQUEST_EDIT_BTN_ID)) + WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), EDITED_PURPOSE_TEXT) } @Then("requester should be able to re-submit the request") def requester_should_be_able_to_resubmit_request(){ @@ -349,4 +366,12 @@ class Requester_step_def_ks { def request_should_be_informed_of_warning_rule_violation(){ //unclear how this is displayed in the UI } + + //Helper function for getting TestObject from the id of an html element + def get_test_object_by_id(String id) { + TestObject tObject = new TestObject(id) + tObject.addProperty("id", ConditionType.EQUALS, id, true) + return tObject + } + } \ No newline at end of file diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index 2a3c0c03b..59e272f7c 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -11,17 +11,42 @@ - '/home/travis/build/bcgov/OCWA/ui_tests/' + '/home/travis/build/bcgov/OCWA/ui_tests/test_files/' TestFilePath - 'testfile1.txt' - TestFile1Name + 'test_valid_file_upload.txt' + ValidFileName - 'testfile2.csv' - TestFile2Name + 'test_warning_extension.csv' + WarningExtensionFileName + + + + 'test_blocked_file_extension.exe' + BlockedExtensionFileName + + + + 'test_min_file_size_limit.txt' + MinSizeLimitFileName + + + + 'test_warning_max_file_size_limit.txt' + WarningMaxSizeLimitFileName + + + + 'test_blocked_max_file_size_limit.txt' + BlockedMaxSizeLimitFileName + + + + 'test_study_ids_in_file.txt' + BlockedStudyIDFileName diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts index d3f3504cb..755794c9e 100644 --- a/ui_tests/Test Suites/CucumberSuite.ts +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -4,7 +4,7 @@ CucumberSuite false - 2018-12-21T12:54:35 + 2019-01-03T11:10:38 0 30 diff --git a/ui_tests/test_files/test_min_file_size_limit.txt b/ui_tests/test_files/test_min_file_size_limit.txt new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/test_files/test_study_ids_in_file.txt b/ui_tests/test_files/test_study_ids_in_file.txt new file mode 100644 index 000000000..319c9e98c --- /dev/null +++ b/ui_tests/test_files/test_study_ids_in_file.txt @@ -0,0 +1,5 @@ +0123456789 +9012345678 +9876543210 +7654321098 +8901234567 \ No newline at end of file diff --git a/ui_tests/test_files/test_valid_file_upload.txt b/ui_tests/test_files/test_valid_file_upload.txt new file mode 100644 index 000000000..40599af91 --- /dev/null +++ b/ui_tests/test_files/test_valid_file_upload.txt @@ -0,0 +1,4 @@ +Project Entity ID,Accident type,Accident Date +3d3bc539-9aec-45e0-96a3-4e851068d5e2,motor vehicle,2/26/2018 +2fc94c19-78d8-42a4-8e1a-0d8103340c72,recreational sport,3/15/2018 +a4832b32-25ac-41fc-96ca-7be5753b98b8,motor vehicle,4/22/2018 diff --git a/ui_tests/test_files/test_warning_extension.csv b/ui_tests/test_files/test_warning_extension.csv new file mode 100644 index 000000000..499fa65bc --- /dev/null +++ b/ui_tests/test_files/test_warning_extension.csv @@ -0,0 +1,4 @@ +Project Entity ID,Hospital Number,Fiscal Year,Province Issuing Health Care Number,Gender,Age in Years,Local Health Area,Triage date/time,Triage Level,Registration Date/Time,Physician Initial Assessment Date/Time,Disposition Date/Time +3d3bc539-9aec-45e0-96a3-4e851068d5e2,111,2017,BC,M,23,Victoria,2017-10-20T21:32:52,5,2018-02-26T21:32:52,2018-02-26T23:32:52,2018-02-26T23:32:52 +a4832b32-25ac-41fc-96ca-7be5753b98b8,121,2017,BC,F,47,Kelowna,2017-11-26T21:32:53,4,2018-02-26T21:32:53,2018-02-26T23:32:53,2018-02-26T23:32:53 +2fc94c19-78d8-42a4-8e1a-0d8103340c72,134,2017,BC,F,62,Vancouver,2017-12-23T21:32:54,5,2018-02-26T21:32:54,2018-02-26T23:32:54,2018-02-26T23:32:54 From 82dd09017c36415f81695b2b280940f185049710 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 3 Jan 2019 11:56:34 -0800 Subject: [PATCH 075/226] try navigating to url that does not use a global var --- ui_tests/Data Files/TestFile1.dat | 16 ---------------- ui_tests/Data Files/TestFile2.dat | 16 ---------------- .../requester/see_requests_by_status.feature | 3 ++- .../scripts/groovy/Requester_step_def_ks.groovy | 12 +++++++++--- ui_tests/test_small_file_size_limit.txt | 0 ui_tests/testfile1.txt | 4 ---- ui_tests/testfile2.csv | 4 ---- 7 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 ui_tests/Data Files/TestFile1.dat delete mode 100644 ui_tests/Data Files/TestFile2.dat delete mode 100644 ui_tests/test_small_file_size_limit.txt delete mode 100644 ui_tests/testfile1.txt delete mode 100644 ui_tests/testfile2.csv diff --git a/ui_tests/Data Files/TestFile1.dat b/ui_tests/Data Files/TestFile1.dat deleted file mode 100644 index ef8081321..000000000 --- a/ui_tests/Data Files/TestFile1.dat +++ /dev/null @@ -1,16 +0,0 @@ - - - file for testing upload - TestFile1 - - true - COMMA - 679aba66-2311-432f-8bab-84485811301a - C:\Users\PaulR\Documents\2 - Metadata\HAS project\hospital_visits_bc_2017.csv - CSV - false - - false - - false - diff --git a/ui_tests/Data Files/TestFile2.dat b/ui_tests/Data Files/TestFile2.dat deleted file mode 100644 index 4e68b8432..000000000 --- a/ui_tests/Data Files/TestFile2.dat +++ /dev/null @@ -1,16 +0,0 @@ - - - File for testing file upload - TestFile2 - - true - - 22393f29-c163-446c-aa0b-da83fe18248a - C:\Users\PaulR\Documents\2 - Metadata\HAS project\sports_accidents_bc_2017.xls - ExcelFile - false - - false - sports_accidents_bc_2017 - false - diff --git a/ui_tests/Include/features/requester/see_requests_by_status.feature b/ui_tests/Include/features/requester/see_requests_by_status.feature index e011181c0..41f49ca12 100644 --- a/ui_tests/Include/features/requester/see_requests_by_status.feature +++ b/ui_tests/Include/features/requester/see_requests_by_status.feature @@ -15,4 +15,5 @@ As an requester I want to be able to see a history of my requests so that I can | Awaiting review | Submitted | | Review in progress | Submitted | | Draft | Draft | - | Work in progress | Draft | \ No newline at end of file + | Work in progress | Draft | + | Cancelled | Cancelled | \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 4ffcc9369..03b09cb4a 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -76,8 +76,8 @@ class Requester_step_def_ks { WebUI.openBrowser('') WebUI.delay(5) - WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - //WebUI.navigateToUrl("http://localhost:8000") + //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = get_test_object_by_id(LOGIN_BTN_ID) WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) @@ -217,6 +217,10 @@ class Requester_step_def_ks { requester_has_submitted_a_request() requester_withdraws_request() break + case "cancelled": + requester_has_submitted_a_request() + requester_cancels_request() + break case "approved": requester_has_submitted_a_request() //output checker needs to claim @@ -280,6 +284,9 @@ class Requester_step_def_ks { case "approved": //stub for when a filter for approved requests is added to UI break + case "cancelled": + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Cancelled')) + break default: throw new Exception("status $status not found") break @@ -315,7 +322,6 @@ class Requester_step_def_ks { WebUI.verifyTextPresent(PURPOSE_TEXT, false) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) WebUI.delay(2) - //WebUI.verifyTextPresent(TEST_COMMENT, false) requester_should_see_their_new_comment_displayed() WebUI.delay(5) WebUI.closeBrowser() diff --git a/ui_tests/test_small_file_size_limit.txt b/ui_tests/test_small_file_size_limit.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui_tests/testfile1.txt b/ui_tests/testfile1.txt deleted file mode 100644 index 40599af91..000000000 --- a/ui_tests/testfile1.txt +++ /dev/null @@ -1,4 +0,0 @@ -Project Entity ID,Accident type,Accident Date -3d3bc539-9aec-45e0-96a3-4e851068d5e2,motor vehicle,2/26/2018 -2fc94c19-78d8-42a4-8e1a-0d8103340c72,recreational sport,3/15/2018 -a4832b32-25ac-41fc-96ca-7be5753b98b8,motor vehicle,4/22/2018 diff --git a/ui_tests/testfile2.csv b/ui_tests/testfile2.csv deleted file mode 100644 index 499fa65bc..000000000 --- a/ui_tests/testfile2.csv +++ /dev/null @@ -1,4 +0,0 @@ -Project Entity ID,Hospital Number,Fiscal Year,Province Issuing Health Care Number,Gender,Age in Years,Local Health Area,Triage date/time,Triage Level,Registration Date/Time,Physician Initial Assessment Date/Time,Disposition Date/Time -3d3bc539-9aec-45e0-96a3-4e851068d5e2,111,2017,BC,M,23,Victoria,2017-10-20T21:32:52,5,2018-02-26T21:32:52,2018-02-26T23:32:52,2018-02-26T23:32:52 -a4832b32-25ac-41fc-96ca-7be5753b98b8,121,2017,BC,F,47,Kelowna,2017-11-26T21:32:53,4,2018-02-26T21:32:53,2018-02-26T23:32:53,2018-02-26T23:32:53 -2fc94c19-78d8-42a4-8e1a-0d8103340c72,134,2017,BC,F,62,Vancouver,2017-12-23T21:32:54,5,2018-02-26T21:32:54,2018-02-26T23:32:54,2018-02-26T23:32:54 From ce7b9736f228c381324bedd98e7c196129b6734d Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 3 Jan 2019 13:45:44 -0800 Subject: [PATCH 076/226] switched the tests for Travis to use the default profile --- .travis.yml | 2 +- ui_tests/.gitignore | 2 +- ui_tests/.project | 18 +++++++ .../groovy/Requester_step_def_ks.groovy | 4 +- ui_tests/Profiles/default.glbl | 52 +++++++++++++++++++ ui_tests/Test Suites/CucumberSuite.ts | 2 +- .../com.kms.katalon.execution.properties | 5 ++ ...com.kms.katalon.execution.webui.properties | 9 +++- 8 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 ui_tests/Profiles/default.glbl diff --git a/.travis.yml b/.travis.yml index 79efa2915..e485b8ef9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -463,7 +463,7 @@ matrix: #RUN Integration Tests - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" + - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="default" -browserType="Chrome (headless)" - name: "Front End" stage: "Frontend" diff --git a/ui_tests/.gitignore b/ui_tests/.gitignore index 5541515b5..b9d3bf996 100644 --- a/ui_tests/.gitignore +++ b/ui_tests/.gitignore @@ -1,7 +1,7 @@ # Katalon Studio Reports/* ReportFolder/* -Profiles/default.glbl +Profiles/local.glbl .classpath .settings *.class diff --git a/ui_tests/.project b/ui_tests/.project index 3955e7e6b..9899034dd 100644 --- a/ui_tests/.project +++ b/ui_tests/.project @@ -88,5 +88,23 @@ (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + 1546550314282 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1546550314310 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 03b09cb4a..fb82a5747 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -76,8 +76,8 @@ class Requester_step_def_ks { WebUI.openBrowser('') WebUI.delay(5) - //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - WebUI.navigateToUrl("http://localhost:8000") + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + //WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = get_test_object_by_id(LOGIN_BTN_ID) WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) diff --git a/ui_tests/Profiles/default.glbl b/ui_tests/Profiles/default.glbl new file mode 100644 index 000000000..f3ed106f1 --- /dev/null +++ b/ui_tests/Profiles/default.glbl @@ -0,0 +1,52 @@ + + + + default + + true + + + 'http://localhost:8000' + OCWA_URL + + + + '/home/travis/build/bcgov/OCWA/ui_tests/test_files/' + TestFilePath + + + + 'test_valid_file_upload.txt' + ValidFileName + + + + 'test_warning_extension.csv' + WarningExtensionFileName + + + + 'test_blocked_file_extension.exe' + BlockedExtensionFileName + + + + 'test_min_file_size_limit.txt' + MinSizeLimitFileName + + + + 'test_warning_max_file_size_limit.txt' + WarningMaxSizeLimitFileName + + + + 'test_blocked_max_file_size_limit.txt' + BlockedMaxSizeLimitFileName + + + + 'test_study_ids_in_file.txt' + BlockedStudyIDFileName + + diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts index 755794c9e..2f6ff16f3 100644 --- a/ui_tests/Test Suites/CucumberSuite.ts +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -4,7 +4,7 @@ CucumberSuite false - 2019-01-03T11:10:38 + 2019-01-03T12:47:19 0 30 diff --git a/ui_tests/settings/internal/com.kms.katalon.execution.properties b/ui_tests/settings/internal/com.kms.katalon.execution.properties index e69de29bb..5d9ce96af 100644 --- a/ui_tests/settings/internal/com.kms.katalon.execution.properties +++ b/ui_tests/settings/internal/com.kms.katalon.execution.properties @@ -0,0 +1,5 @@ +#Wed Jan 02 14:47:57 PST 2019 +execution.default.timeout=30 +execution.default.openReportAfterExecuting=false +execution.default.quitDriversAfterExecutingTestCase=false +execution.default.quitDriversAfterExecutingTestSuite=true diff --git a/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties index c09ce9715..ebe677f9a 100644 --- a/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties +++ b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties @@ -1,2 +1,7 @@ -#Sat Sep 08 18:41:20 NZST 2018 -execution.default.selectingCapturedObjectSelectorMethod="XPATH" +#Wed Jan 02 14:47:57 PST 2019 +execution.default.selectingCapturedObjectSelectorMethod="XPATH" +execution.default.webUi.enablePageLoadTimeout=false +execution.default.webUi.pageLoadTimeout=30 +execution.default.webUi.ignorePageLoadTimeOutException=false +execution.default.webUi.actionDelay=0 +execution.default.waitForIEHanging=600 From 38ed95afa4c93e2cb93003f4de366bb2f94ffc0e Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 3 Jan 2019 14:10:56 -0800 Subject: [PATCH 077/226] fixed path of microservice template config file; upgraded KS to 5.10.1 --- .travis.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index e485b8ef9..3c1470ebb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,13 +105,13 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi @@ -150,7 +150,7 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - sudo pytest - wget -q ${HELM_URL}/${HELM_TGZ} @@ -203,11 +203,11 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1,validator -m pytest - helm lint helm/validate-api @@ -250,13 +250,13 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1,validator -m pytest - sudo coverage xml - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1 -m pytest - sudo coverage xml @@ -323,13 +323,13 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi @@ -427,7 +427,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & @@ -435,19 +435,19 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & #Start Request Api - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/default.json.template config/default.json - - cp config/test.json.template config/test.json + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json - NODE_ENV=test npm start & #Start FrontEnd - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - yarn - NODE_ENV=test yarn start & @@ -516,7 +516,7 @@ env: - YAMLLINT_VERSION=1.8.1 - CXX=g++-4.8 - MONGODB=4.1.1 - - KATALON_VERSION=5.9.0 + - KATALON_VERSION=5.10.1 - TUSD_VERSION=0.11.0 - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - SONAR_APP=sonar-scanner From 4d8e6814d9fb0198478b3677f92b35dcece9871b Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 09:54:26 -0800 Subject: [PATCH 078/226] intitial Katalon automated testing commit --- ui-tests/.gitignore | 217 ++++++++ ui-tests/.project | 56 +++ ui-tests/.travis.yml | 474 ++++++++++++++++++ ui-tests/Include/config/log.properties | 6 + ...discussion_status_approved_request.feature | 7 + .../manual_output_checking_component.feature | 19 + .../team_sharing_component.feature | 22 + .../output_checker/adjudicate request.feature | 17 + .../output_checker/claim_request.feature | 14 + .../output_checker/undo_approval.feature | 9 + ...tered_requests_for_output_checkers.feature | 12 + ..._approved_output_files_outside_SRE.feature | 7 + .../requester/canceling_request.feature | 7 + .../requester/create_a_new_request.feature | 39 ++ .../features/requester/draft_requests.feature | 16 + .../edit_previously_submitted_request.feature | 8 + .../features/requester/notifications.feature | 23 + .../requester/request_discussion.feature | 15 + ...edit_project_team_members_requests.feature | 15 + .../requester/see_requests_by_status.feature | 18 + .../requester/view_request_details.feature | 7 + .../groovy/Requester_step_def_kr.groovy | 100 ++++ .../groovy/Requester_step_def_ks.groovy | 107 ++++ .../random_test_request_name.groovy | 33 ++ ui-tests/LICENSE | 201 ++++++++ ui-tests/OCWA.prj | 28 ++ .../input_Password_login.rs | 107 ++++ .../input_Password_password.rs | 107 ++++ .../input_Username or email_userna.rs | 113 +++++ .../a_OCWA Export Tool.rs | 86 ++++ .../a_gfggggg.rs | 91 ++++ .../button_All.rs | 97 ++++ .../div_My RequestsAllDraftQueuedI.rs | 67 +++ .../div_Request Name_Content-ve26f.rs | 66 +++ .../div_You have no requests.rs | 73 +++ .../h1_gfggggg.rs | 72 +++ .../input_Request Name_name.rs | 111 ++++ .../Page_OCWA Development Version/span_All.rs | 72 +++ .../span_Cancel (1).rs | 72 +++ .../span_Cancel.rs | 72 +++ .../span_Draft.rs | 72 +++ .../span_Login (1).rs | 54 ++ .../span_Login.rs | 54 ++ .../span_New Request (1).rs | 79 +++ .../span_New Request.rs | 83 +++ .../span_New Request_1.rs | 70 +++ .../span_Save Close (1).rs | 74 +++ .../span_Save Close.rs | 70 +++ .../table_StatusRequest Identifier.rs | 67 +++ ui-tests/Profiles/default.glbl | 7 + .../Script1544053608217.groovy | 17 + .../Requester/Run cucumber tests.tc | 8 + .../Test Suites/Run OCWA test cases.groovy | 66 +++ ui-tests/Test Suites/Run OCWA test cases.ts | 20 + ui-tests/console.properties | 5 + ui-tests/runTests.sh | 3 + ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 6 + ...com.kms.katalon.execution.webui.properties | 6 + ...s.katalon.integration.analytics.properties | 0 ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 ui-tests/sonar-project.properties | 32 ++ 63 files changed, 3476 insertions(+) create mode 100644 ui-tests/.gitignore create mode 100644 ui-tests/.project create mode 100644 ui-tests/.travis.yml create mode 100644 ui-tests/Include/config/log.properties create mode 100644 ui-tests/Include/features/administator/export_discussion_status_approved_request.feature create mode 100644 ui-tests/Include/features/administator/manual_output_checking_component.feature create mode 100644 ui-tests/Include/features/administator/team_sharing_component.feature create mode 100644 ui-tests/Include/features/output_checker/adjudicate request.feature create mode 100644 ui-tests/Include/features/output_checker/claim_request.feature create mode 100644 ui-tests/Include/features/output_checker/undo_approval.feature create mode 100644 ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature create mode 100644 ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature create mode 100644 ui-tests/Include/features/requester/canceling_request.feature create mode 100644 ui-tests/Include/features/requester/create_a_new_request.feature create mode 100644 ui-tests/Include/features/requester/draft_requests.feature create mode 100644 ui-tests/Include/features/requester/edit_previously_submitted_request.feature create mode 100644 ui-tests/Include/features/requester/notifications.feature create mode 100644 ui-tests/Include/features/requester/request_discussion.feature create mode 100644 ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature create mode 100644 ui-tests/Include/features/requester/see_requests_by_status.feature create mode 100644 ui-tests/Include/features/requester/view_request_details.feature create mode 100644 ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy create mode 100644 ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy create mode 100644 ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy create mode 100644 ui-tests/LICENSE create mode 100644 ui-tests/OCWA.prj create mode 100644 ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs create mode 100644 ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs create mode 100644 ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs create mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs create mode 100644 ui-tests/Profiles/default.glbl create mode 100644 ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy create mode 100644 ui-tests/Test Cases/Requester/Run cucumber tests.tc create mode 100644 ui-tests/Test Suites/Run OCWA test cases.groovy create mode 100644 ui-tests/Test Suites/Run OCWA test cases.ts create mode 100644 ui-tests/console.properties create mode 100644 ui-tests/runTests.sh create mode 100644 ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.execution.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.execution.webui.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.jira.properties create mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties create mode 100644 ui-tests/sonar-project.properties diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore new file mode 100644 index 000000000..91344686a --- /dev/null +++ b/ui-tests/.gitignore @@ -0,0 +1,217 @@ +# General Ignore +#bin/ +.idea +.DS_Store + +#Helm +helm/ocwa/charts/* +helm/ocwa/config.yaml + +# Golang Ignore + +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + + +# Node Ignore + +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless + + +# Python Ignore + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +/bin/ +/Libs/ +/.settings/ +/.classpath +.svn/ + +# Katalon Studio +Reports/* + diff --git a/ui-tests/.project b/ui-tests/.project new file mode 100644 index 000000000..f129bb1da --- /dev/null +++ b/ui-tests/.project @@ -0,0 +1,56 @@ + + + C%%Users%PaulR%Documents%OCWA%OCWA.prj + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + + + 1544033544591 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1544033544600 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1544122890560 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1544122890586 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + diff --git a/ui-tests/.travis.yml b/ui-tests/.travis.yml new file mode 100644 index 000000000..202efcebf --- /dev/null +++ b/ui-tests/.travis.yml @@ -0,0 +1,474 @@ +dist: trusty +sudo: required +language: python + +services: +- docker + +addons: + sonarcloud: + organization: "ajc_bcgov" + token: + secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= + +matrix: + include: + - name: "Forum Api" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + before_script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + - helm lint helm/forum-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Request Api" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - npm install + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + - helm lint helm/request-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Policy Api" + language: python + python: + - "3.6" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - helm lint helm/policy-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Validation Api" + language: python + python: + - "3.6" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - helm lint helm/validate-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Front End" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Scan - Python" + python: + - "3.6" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1 -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi + + - name: "Scan - NodeJS" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + + - cd /home/travis/build/bcgov/OCWA/frontend + - npm test + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi + + - name: "OCWA Master Helm Chart" + language: node_js + node_js: + - "node" + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa + + - name: "Integration Tests" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + + - cd /home/travis/build/bcgov/OCWA/frontend + - npm test + + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + + #Install Katalon Studios + - cd /home/travis/build/bcgov/OCWA/ui-tests + - chmod ugo+x runTests.sh + - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz + - tar -xvf Katalon_Studio_${KATALON_VERSION}.tar.gz + - ls -liah Katalon_Studio_${KATALON_VERSION}/ + - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} + + #RUN Integration Tests + - ./runTests.sh + +env: + global: + - HELM_URL=https://storage.googleapis.com/kubernetes-helm + - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz + - TARGET_BR=gh-pages + - REPO_DIR=/home/travis/build/kubenow/helm-charts + - GH_URL=https://kubenow.github.io/helm-charts + - YAMLLINT_VERSION=1.8.1 + - CXX=g++-4.8 + - MONGODB=4.1.1 + - KATALON_VERSION=Linux_64-5.8.2 + - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ + - SONAR_APP=sonar-scanner + - SONAR_VERSION=3.2.0.1227-linux + - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= + - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= + #SONAR_TOKEN + - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= + #QUAYIO_USERNAME + - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= + #QUAYIO_PASSWORD + - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= diff --git a/ui-tests/Include/config/log.properties b/ui-tests/Include/config/log.properties new file mode 100644 index 000000000..8142b1dc2 --- /dev/null +++ b/ui-tests/Include/config/log.properties @@ -0,0 +1,6 @@ +# This file is used to configure Katalon Studio execution log levels. + +# When you need to troubleshoot Katalon Studio issue +# logging.level.com.kms=TRACE + +# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature b/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature new file mode 100644 index 000000000..263130bd7 --- /dev/null +++ b/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature @@ -0,0 +1,7 @@ +Feature: export discussion and status log of a request +As an administrator I need the ability to export a discussion / status log to a pdf file upon request approval so that I have a file-based log of the conversation independent of the database + + Scenario: generate an export log of a newly approved request + Given a request has a status of "Review in Progress" + When an output checker approves the request + Then a pdf file should be generates that chronologically lists the discussion about the request as well as status changes \ No newline at end of file diff --git a/ui-tests/Include/features/administator/manual_output_checking_component.feature b/ui-tests/Include/features/administator/manual_output_checking_component.feature new file mode 100644 index 000000000..62c5aa0c6 --- /dev/null +++ b/ui-tests/Include/features/administator/manual_output_checking_component.feature @@ -0,0 +1,19 @@ +Feature: Enable / Disable manual output checker component +As an administrator I need the ability to disable the manual output checker components so that stakeholders that do not have a manual output checking step in their export process can still utilize the application + + Scenario: Manual output checking component turned off and passes all policy tests + Given the manual output checking component has been marked as disabled + And the request passes all policy tests + When a request is submitted + Then the request status should be "Approved" + + Scenario: Manual output checking component turned off and fails a policy test + Given the manual output checking component has been marked as disabled + And the request fails at least one policy test + When a request is submitted + Then the request status should be "Work in progress" + + Scenario: Manual output checking component is turned on + Given the manual output checking component has been marked as enabled + When a request is submitted + Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui-tests/Include/features/administator/team_sharing_component.feature b/ui-tests/Include/features/administator/team_sharing_component.feature new file mode 100644 index 000000000..328d41da8 --- /dev/null +++ b/ui-tests/Include/features/administator/team_sharing_component.feature @@ -0,0 +1,22 @@ +Feature: team sharing of requests +As an administrator I need the ability to enable / disable the ability for requesters to view / edit their team member's request on a per project basis so that multiple types of project sharing models can be accommodated + + Scenario outline: Team sharing enabled + Given team sharing has been marked as enabled + And requester A is logged in + And requester B on the same project exists + And requester B has a request + When requester A views team's requests + Then requester B's request status should be visible + Example: + | status | + | Draft | + | Awaiting review | + | Review in progress | + | Approved | + | Work in progress | + | Archived | + Scenario: Team sharing disabled + Given team sharing has been marked as disabled + When a request is submitted + Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/adjudicate request.feature b/ui-tests/Include/features/output_checker/adjudicate request.feature new file mode 100644 index 000000000..aa0da9e64 --- /dev/null +++ b/ui-tests/Include/features/output_checker/adjudicate request.feature @@ -0,0 +1,17 @@ +Feature: Adjudicate request +As an output checker I need the ability to change the status of a request to "Revisions required" so that I can allow the requester to tweak their request without having deny the request and forcing the requester to create a new request +As an output checker I need the ability to change the status of a request to "Approved" so that I can allow the requester to take their outputs out of the SRE + + Scenario: Request is worthy of approval + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as approved + Then the output checker should see the status of the request updated to "Approved" + And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request + + Scenario: Request is needs revisions + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as needs revisions + Then the output checker should see the status of the request updated to "Work in progress" + And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/claim_request.feature b/ui-tests/Include/features/output_checker/claim_request.feature new file mode 100644 index 000000000..371010dd3 --- /dev/null +++ b/ui-tests/Include/features/output_checker/claim_request.feature @@ -0,0 +1,14 @@ +Feature: Claim a request +As an output checker I need the ability to claim a request so that I can let my fellow output checker know that I'm going to be working on a particular request + +Scenario: Claim an unclaimed request +Given output checker has logged in +When output checker tries to claim an unclaimed request +Then the output checker should be able to see that they're now assigned the request + +Scenario: Claim a request already claimed by another output checker +Given output checker has logged in + And at least on other output checker exists + And the other output checker is assigned to a request +When output checker tries to claim the already assigned request +Then the output checker should be able to see that they're now assigned the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/undo_approval.feature b/ui-tests/Include/features/output_checker/undo_approval.feature new file mode 100644 index 000000000..d82687a8f --- /dev/null +++ b/ui-tests/Include/features/output_checker/undo_approval.feature @@ -0,0 +1,9 @@ +Feature: Undo request approval +As an output checker I need the ability to undo a request approval so that I can appropriately update requests to fix requests that were accidently approved or need to be made unavailable to an requester + +Scenario: Undo an approved request +Given output checker has logged in + And at least one approved request exists +When output checker submits an approved request to undo +Then the output checker should see that the request is now has a status of "Work in progress" +And the status of "Accepted" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature b/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature new file mode 100644 index 000000000..0300a9ed3 --- /dev/null +++ b/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature @@ -0,0 +1,12 @@ +Feature: See a list of all output checking requests +As an output checker I need the ability to see all requests so that I can quickly see what is in the queue + +Scenario Outline: View requests + Given output checker has logged in + When output checker selects a filter + Then the output checker should only see requests of type + Examples: + | filter | filter_condition | + | My requests | requests claimed by the output checker | + | Unassigned | requests not claimed by an output checker | + | All | all requests | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature b/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature new file mode 100644 index 000000000..f4951feff --- /dev/null +++ b/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature @@ -0,0 +1,7 @@ +Feature: Access approved output files outside of the secure environment +As an requester I want to be able to access approved output files outside of the secure environment so that I can share my results with others + Scenario: Access approved request outside of the SRE + Given requester has logged in (outside of SRE) + And requester has an approved request + When requester views their request's approved files + Then requester can copy their approved files to their local computer \ No newline at end of file diff --git a/ui-tests/Include/features/requester/canceling_request.feature b/ui-tests/Include/features/requester/canceling_request.feature new file mode 100644 index 000000000..a54c7dbbb --- /dev/null +++ b/ui-tests/Include/features/requester/canceling_request.feature @@ -0,0 +1,7 @@ +Feature: Canceling a request +As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed + Scenario: Cancel a request + Given requester has logged in + And requester has a request that is "Awaiting review" or "Review in progress" + When the requester cancels the request + Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui-tests/Include/features/requester/create_a_new_request.feature b/ui-tests/Include/features/requester/create_a_new_request.feature new file mode 100644 index 000000000..a44ea1746 --- /dev/null +++ b/ui-tests/Include/features/requester/create_a_new_request.feature @@ -0,0 +1,39 @@ +Feature: create a new request + As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment + Background: + Given requester has logged in + And requester initiates a new request + And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of the authorized user�s knowledge + Scenario: A valid request + Given the export files do not violate any blocking rules + When requester submits their request + Then the requester's request is put in awaiting review + Scenario: A request has no data + Given requester does not provide any data they wish to export + When requester submits their request + Then the requester should not be able to submit the request + + Scenario Outline: A request violates blocking rule + Given a request violates blocking rule: + When requester submits their request + Then requester should not be able to submit the request + And the requester should be informed that has been violated + + Examples: + | blocking_rule | + | A request that has a file that is too big | + | The summation of all export file sizes exceeds the request file size limit | + | An export file has a blocked file extension | + | A request has a file with a StudyID in it | + + Scenario Outline: A request violates warning rule + Given a request violates blocking rule: + When requester submits their request + Then requester should be able to submit the request + And the requester should be informed that has been violated + + Examples: + | warning_rule | + | A request that has a file that exceeds the file size warning threshold | + | The summation of all export file sizes exceeds the request file size warning threshold | + | An export file has a warning file extension | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/draft_requests.feature b/ui-tests/Include/features/requester/draft_requests.feature new file mode 100644 index 000000000..cbe142827 --- /dev/null +++ b/ui-tests/Include/features/requester/draft_requests.feature @@ -0,0 +1,16 @@ +Feature: Draft requests +As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once + Background: + Given requester has logged in + Scenario: Save a draft request (no files) + And requester has started a request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off + + Scenario: Save a draft request (with files) + And requester has started a request + And requester add output files to the request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off \ No newline at end of file diff --git a/ui-tests/Include/features/requester/edit_previously_submitted_request.feature b/ui-tests/Include/features/requester/edit_previously_submitted_request.feature new file mode 100644 index 000000000..05dcde51b --- /dev/null +++ b/ui-tests/Include/features/requester/edit_previously_submitted_request.feature @@ -0,0 +1,8 @@ +Feature: edit a previously submitted request +As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request + Scenario: Edit a request that has been reviewed by an output checker and needs revisions + Given requester has logged in + And requester the request is "Work in Progress" + When the requester views the request + Then the requester should be able to make changes to the request + And re-submit the request \ No newline at end of file diff --git a/ui-tests/Include/features/requester/notifications.feature b/ui-tests/Include/features/requester/notifications.feature new file mode 100644 index 000000000..086673c6a --- /dev/null +++ b/ui-tests/Include/features/requester/notifications.feature @@ -0,0 +1,23 @@ +Feature: Notifications +As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action + + Scenario Outline: requester notifications + Given an requester has created or modified a request + When occurs + Then the requester should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | output checker makes a comment on the request | + | output checker approves the request | + | output checker requests revisions the request | + + Scenario Outline: output checker notifications + Given an output checker has currently claimed a request + When occurs + Then the output checker should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | requester makes a comment on the request | + | requester re-submits a request | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/request_discussion.feature b/ui-tests/Include/features/requester/request_discussion.feature new file mode 100644 index 000000000..f6aff55b7 --- /dev/null +++ b/ui-tests/Include/features/requester/request_discussion.feature @@ -0,0 +1,15 @@ +Feature: Discussion about a request + As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request + As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request + Scenario: requester adds a new comment about request + Given requester has logged in + And requester has a submitted request + And the request has been claimed by an output checker + When requester writes and submits a new comment + Then the requester should see their new comment displayed + And the output checker assigned to the request should be notified of the new comment + Scenario: Output checker adds a new comment about request + Given output checker has logged in + When output checker writes and submits a new comment + Then the output checker should see their new comment displayed + And the requester(s) associated to the request should be notified of the new comment \ No newline at end of file diff --git a/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature b/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature new file mode 100644 index 000000000..7e42638e3 --- /dev/null +++ b/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature @@ -0,0 +1,15 @@ +Feature: seeing / editing project team members requests +As an requester I need the ability to see / edit my team member's requests so that I can more easily collaborate with my fellow team members + Background: + Given requester has logged in + And the requester is a member of a project team + And another project team member has created a request + And the project has team sharing enabled + Scenario: View / edit a team member's request in a project that allows editing of team member's requests + Given the requester's project allows for editing of team member's requests + When the requester views their requests + Then the team member's request should be visible and editable + Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests + Given the requester's project does not allow for editing of team member's requests + When the requester views their requests + Then the team member's request should not be visible or editable \ No newline at end of file diff --git a/ui-tests/Include/features/requester/see_requests_by_status.feature b/ui-tests/Include/features/requester/see_requests_by_status.feature new file mode 100644 index 000000000..14c8c5bc5 --- /dev/null +++ b/ui-tests/Include/features/requester/see_requests_by_status.feature @@ -0,0 +1,18 @@ +Feature: See requester's requests by status +As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review + Scenario Outline: View requests + Given requester has logged in + And the requester has an request + And request was last updated within the last month + When requester views requests + Then requests should be displayed + But requests with updates older than a month should not be displayed + + Examples: + | status | filter | + | Approved | Approved | + | Revisions required | Draft | + | Awaiting review | Submitted | + | Review in progress | Submitted | + | Draft | Draft | + | Work in progress | Draft | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/view_request_details.feature b/ui-tests/Include/features/requester/view_request_details.feature new file mode 100644 index 000000000..d7ad2b06b --- /dev/null +++ b/ui-tests/Include/features/requester/view_request_details.feature @@ -0,0 +1,7 @@ +Feature: View request details +As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions + Scenario: View details of a request + Given requester has logged in + And the requester has submitted a request + When the requester views the request + Then the requester should see the complete record of the request (including export files, supporting files/text, discussion, and status changes) \ No newline at end of file diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy new file mode 100644 index 000000000..88dd0897e --- /dev/null +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy @@ -0,0 +1,100 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as MobileBuiltInKeywords +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WSBuiltInKeywords +import com.kms.katalon.core.webui.driver.DriverFactory as DriverFactory +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +import org.openqa.selenium.firefox.FirefoxDriver +import org.openqa.selenium.WebDriver +import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium + +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When + +import static org.junit.Assert.* +import java.util.regex.Pattern +import static org.apache.commons.lang3.StringUtils.join + + + +public class Requester_step_def_kr { + + WebDriverBackedSelenium selenium + String request_name + + @Given("yrequester has logged in") + def requester_login() { + + WebUI.openBrowser('') + def driver = DriverFactory.getWebDriver() + String baseUrl = "http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/" + selenium = new WebDriverBackedSelenium(driver, baseUrl) + selenium.open("http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/") + selenium.click("id=app-auth-login-button") + selenium.type("id=username", "xxx") + selenium.type("id=password", "xxx") + selenium.click("id=kc-login") + } + + @Given("yrequester has started a request") + def requester_starts_new_request() { + WebUI.waitForPageLoad(0) + selenium.click("id=new-request-button") + + request_name = randomString() + selenium.type("id=name", request_name) + } + + @Given("ythe requester has submitted a request") + def requester_submits_a_request() { + requester_starts_new_request() + //requester saves and add files + //requester adds output files + //requester adds supporting files + //requester add supporting text + //requester submits request for review + } + + @Given("yrequester add output files to the request") + def requester_adds_output_files() { + // selenium.click("id=request-form-save-files-button") + // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") + } + + + @Given("yhas not submitted the request") + def requester_has_not_submitted_new_request() { + } + + @When("ythe requester saves their request") + def requester_saves_new_request() { + selenium.click("id=request-form-save-close-button") + } + + @Then("ythe requester should be able to re-open the request and pick up where they left off") + def confirm_draft_save_was_successful() { + WebUI.waitForPageLoad(0) + WebUI.verifyTextPresent(request_name, false) + } + + def randomString() { + Date today = new Date() + String todaysDate = today.format('MMddyy-hhmm') + String engagementName = 'auto_eng ' + todaysDate + return engagementName + } +} diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy new file mode 100644 index 000000000..00a0c0453 --- /dev/null +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -0,0 +1,107 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.annotation.Keyword +import com.kms.katalon.core.checkpoint.Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.testcase.TestCase +import com.kms.katalon.core.testcase.TestCaseFactory +import com.kms.katalon.core.testdata.TestData +import com.kms.katalon.core.testdata.TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository +import com.kms.katalon.core.testobject.TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords + +import internal.GlobalVariable + +import MobileBuiltInKeywords as Mobile +import WSBuiltInKeywords as WS +import WebUiBuiltInKeywords as WebUI + +import org.openqa.selenium.WebElement +import org.openqa.selenium.WebDriver +import org.openqa.selenium.By + +import com.kms.katalon.core.mobile.keyword.internal.MobileDriverFactory +import com.kms.katalon.core.webui.driver.DriverFactory + +import com.kms.katalon.core.testobject.RequestObject +import com.kms.katalon.core.testobject.ResponseObject +import com.kms.katalon.core.testobject.ConditionType +import com.kms.katalon.core.testobject.TestObjectProperty + +import com.kms.katalon.core.mobile.helper.MobileElementCommonHelper +import com.kms.katalon.core.util.KeywordUtil + +import com.kms.katalon.core.webui.exception.WebElementNotFoundException + +import cucumber.api.java.en.And +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When + + +class Requester_step_def_ks { + String request_name = '' + TestObject newRequestButtonObject = null + TestObject requestFormSaveCloseButtonObject = null + + /** + * The step definitions below match with Katalon sample Gherkin steps + */ + @Given("requester has logged in") + def requester_login() { + WebUI.openBrowser('') + + WebUI.navigateToUrl('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) + + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + + WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + + WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + } + + @Given("requester has started a request") + def requester_starts_new_request() { + + newRequestButtonObject = new TestObject("new-request-button") + newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + + WebUI.waitForPageLoad(0) + + WebUI.waitForElementClickable(newRequestButtonObject, 0) + WebUI.click(newRequestButtonObject) + + request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + } + + @Given("has not submitted the request") + def requester_has_not_submitted_new_request() { + } + + @Given("requester add output files to the request") + def requester_adds_output_files() { + } + + @When("the requester saves their request") + def requester_saves_new_request() { + requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + WebUI.click(requestFormSaveCloseButtonObject) + } + + @Then("the requester should be able to re-open the request and pick up where they left off") + def confirm_draft_save_was_successful() { + WebUI.waitForPageLoad(0) + WebUI.verifyTextPresent(request_name, false) + } +} \ No newline at end of file diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy new file mode 100644 index 000000000..281c294f2 --- /dev/null +++ b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -0,0 +1,33 @@ +package test_OCWA_keywords + +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.annotation.Keyword +import com.kms.katalon.core.checkpoint.Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.testcase.TestCase +import com.kms.katalon.core.testdata.TestData +import com.kms.katalon.core.testobject.TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI + +import internal.GlobalVariable + + +public class random_test_request_name { + @Keyword + def gen_random_test_request_name() { + Date today = new Date() + String todaysDate = today.format('MMddyy-hhmm') + String engagementName = 'auto_eng ' + todaysDate + //return (engagementName) + //WebUI.comment(engagementName) + //return "bananas" + return engagementName + } +} \ No newline at end of file diff --git a/ui-tests/LICENSE b/ui-tests/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/ui-tests/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/ui-tests/OCWA.prj b/ui-tests/OCWA.prj new file mode 100644 index 000000000..b72b1c47e --- /dev/null +++ b/ui-tests/OCWA.prj @@ -0,0 +1,28 @@ + + + + OCWA + + c5e0fe7e-c962-4704-a11f-3f2a0dde36b0 + 5.9.0 + 0 + + + + Include/scripts/groovy + + + + + Include/scripts/groovy + + + Include/features + + + Include/config + + + + GENERIC + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs b/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs new file mode 100644 index 000000000..231e9f891 --- /dev/null +++ b/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs @@ -0,0 +1,107 @@ + + + + input_Password_login + + b03993b5-c5ae-4031-8150-2361e6dc57b7 + + + XPATH + //input[@id='kc-login'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 4 + + + false + equals + class + Main + btn btn-primary btn-lg + + + true + equals + name + Main + login + + + true + equals + id + Main + kc-login + + + true + equals + type + Main + submit + + + false + equals + value + Main + Log in + + + false + equals + xpath + Main + id("kc-login") + + + true + equals + xpath:attributes + //input[@id='kc-login'] + + + false + equals + xpath:idRelative + //div[@id='kc-form-buttons']/div/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'kc-login', '"', ')')])[1]/preceding::input[1] + + + false + equals + xpath:position + //div[3]/div[2]/div/input + + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs b/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs new file mode 100644 index 000000000..9a0da9be0 --- /dev/null +++ b/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs @@ -0,0 +1,107 @@ + + + + input_Password_password + + 0e5ab8cd-490d-4fe5-8476-6643d833291e + + + XPATH + //input[@id='password'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 2 + + + true + equals + id + Main + password + + + false + equals + class + Main + form-control + + + true + equals + name + Main + password + + + true + equals + type + Main + password + + + false + equals + autocomplete + Main + off + + + false + equals + xpath + Main + id("password") + + + true + equals + xpath:attributes + //input[@id='password'] + + + false + equals + xpath:idRelative + //form[@id='kc-form-login']/div[2]/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[2] + + + false + equals + xpath:position + //div[2]/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[2] + + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs b/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs new file mode 100644 index 000000000..e4518409c --- /dev/null +++ b/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs @@ -0,0 +1,113 @@ + + + + input_Username or email_userna + + 1e087123-1a2b-412f-9b3f-f68243f2f4cc + + + XPATH + //input[@id='username'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 1 + + + true + equals + id + Main + username + + + false + equals + class + Main + form-control + + + true + equals + name + Main + username + + + true + equals + type + Main + text + + + false + equals + autocomplete + Main + off + + + false + equals + xpath + Main + id("username") + + + true + equals + xpath:attributes + //input[@id='username'] + + + false + equals + xpath:idRelative + //form[@id='kc-form-login']/div/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='ocwa'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/preceding::input[1] + + + false + equals + xpath:position + //input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[3] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs b/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs new file mode 100644 index 000000000..d8b91480a --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs @@ -0,0 +1,86 @@ + + + + a_OCWA Export Tool + + 25096df1-9278-4593-ba26-96d3644e62fb + + + XPATH + //div[@id='main']/div/div/main/div/a + + + XPATH + false + + true + equals + tag + Main + a + + + false + equals + class + Main + src-components-app-bar-styles_brand--2yq_z3-4 + + + true + equals + href + Main + / + + + true + equals + text + Main + OCWA Export Tool + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-components-app-bar-styles_container--1ufsCzTM"]/a[@class="src-components-app-bar-styles_brand--2yq_z3-4"] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div/a + + + false + equals + xpath:link + //a[contains(text(),'OCWA Export Tool')] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/preceding::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='gfggggg'])[1]/preceding::a[1] + + + false + equals + xpath:href + //a[contains(@href, '/')] + + + false + equals + xpath:position + //a + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs b/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs new file mode 100644 index 000000000..4b8862f1c --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs @@ -0,0 +1,91 @@ + + + + a_gfggggg + + 8030b58a-35da-4934-a959-42f86e9e595f + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table/tbody/tr/td[2]/strong/a + + + XPATH + false + + true + equals + tag + Main + a + + + true + equals + href + Main + /requests/5c08241fe35b430013db0cae + + + true + equals + text + Main + gfggggg + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainerAdvanced__Container-sc-1s2zdt8-0 cFyKDm"]/table[@class="DynamicTable__Table-sc-1naczgt-0 cFUPVR"]/tbody[1]/tr[@class="TableRow__TableBodyRow-sc-1kwbh2h-0 jLQmXi"]/td[@class="TableCell__TableBodyCell-sc-1mgclzx-0 dGStZT"]/strong[1]/a[1] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table/tbody/tr/td[2]/strong/a + + + false + equals + xpath:link + //a[contains(text(),'gfggggg')] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Output Checker'])[1]/following::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Updated On'])[1]/following::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Dec 5th, 2018'])[1]/preceding::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Dec 5th, 2018'])[2]/preceding::a[1] + + + false + equals + xpath:href + //a[contains(@href, '/requests/5c08241fe35b430013db0cae')] + + + false + equals + xpath:position + //strong/a + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs b/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs new file mode 100644 index 000000000..e3e500cf5 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs @@ -0,0 +1,97 @@ + + + + button_All + + 57c6c6d1-9295-45c9-a94f-4e2707f2030b + + + XPATH + (//button[@type='button'])[2] + + + BASIC + //button[@type = 'button' and (text() = 'All' or . = 'All')] + + + BASIC + false + + true + equals + tag + Main + button + + + false + equals + class + Main + sc-ifAKCX eiXwJb + + + false + equals + spacing + Main + default + + + true + equals + type + Main + button + + + true + equals + text + Main + All + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"] + + + true + equals + xpath:attributes + (//button[@type='button'])[2] + + + false + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::button[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::button[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::button[1] + + + false + equals + xpath:position + //nav/div/div/button + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs new file mode 100644 index 000000000..7fdfa747c --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs @@ -0,0 +1,67 @@ + + + + div_My RequestsAllDraftQueuedI + + 0fbd49b5-aff6-4db6-a4fe-1ca40e30216a + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2] + + + XPATH + false + + true + equals + tag + Main + div + + + false + equals + class + Main + sc-jTzLTM gBDbcZ + + + true + equals + text + Main + My RequestsAllDraftQueued/In ReviewFlaggedDeniedCancelledStatusRequest IdentifierSubmitted OnUpdated OnOutput CheckergfgggggDec 5th, 2018Dec 5th, 2018-Actions + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::div[17] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::div[18] + + + false + equals + xpath:position + //div[2]/div/div/div[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs new file mode 100644 index 000000000..ba14bcb03 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs @@ -0,0 +1,66 @@ + + + + div_Request Name_Content-ve26f + + 7c1d1122-bf34-4010-91ca-3e08c1ecd1b7 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::div[3] + + + XPATH + false + + true + equals + tag + Main + div + + + false + equals + class + Main + Content-ve26fj-1 kmGRCO + + + true + equals + xpath + Main + /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-clBsIJ daqMjj"]/div[@class="Form__FormWrapper-sc-11btfyj-0 fTWjSn"]/form[1]/div[@class="Field__FieldWrapper-vqybw1-0 doxtck"]/div[@class="FieldTextStateless__Wrapper-ynbdsh-0 gIJAym"]/div[@class="Content__ContentWrapper-ve26fj-2 feWTNh"]/div[@class="Content__ChildWrapper-ve26fj-0 ilJUcG"]/div[@class="Content-ve26fj-1 kmGRCO"] + + + true + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::div[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::div[5] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='This field is required'])[1]/preceding::div[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::div[2] + + + false + equals + xpath:position + //form/div/div/div/div/div + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs new file mode 100644 index 000000000..66899c38a --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs @@ -0,0 +1,73 @@ + + + + div_You have no requests + + b89ed3fb-0198-49dd-8259-f0813e8d1488 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div[2] + + + XPATH + false + + true + equals + tag + Main + div + + + false + equals + class + Main + LoadingContainer__Container-kdx72l-0 cnWOuY + + + true + equals + text + Main + You have no requests! + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainer__Container-kdx72l-0 cnWOuY"] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Output Checker'])[1]/following::div[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Updated On'])[1]/following::div[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flag notifications'])[1]/preceding::div[7] + + + false + equals + xpath:position + //div[2]/div/div/div/div/div[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs b/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs new file mode 100644 index 000000000..d8959732d --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs @@ -0,0 +1,72 @@ + + + + h1_gfggggg + + a1fc170f-0b98-4d7d-b215-a30c8ce55c48 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/h1 + + + XPATH + false + + true + equals + tag + Main + h1 + + + true + equals + text + Main + gfggggg + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-request-styles_header--3R28zHQp"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG bLOLTU"]/div[1]/h1[1] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/h1 + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::h1[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::h1[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::h1[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Details'])[1]/preceding::h1[1] + + + false + equals + xpath:position + //h1 + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs b/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs new file mode 100644 index 000000000..e44636ebc --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs @@ -0,0 +1,111 @@ + + + + input_Request Name_name + + 381e4370-629e-492b-bd3c-5ca7701548b9 + + + XPATH + //input[@id='name'] + + + BASIC + //input[@id = 'name' and @name = 'name' and @type = 'text'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + class + Main + Input__InputElement-sc-1o6bj35-0 bfCuIo + + + true + equals + id + Main + name + + + true + equals + name + Main + name + + + false + equals + spellcheck + Main + true + + + true + equals + type + Main + text + + + false + equals + value + Main + R + + + false + equals + xpath + Main + id("name") + + + true + equals + xpath:attributes + //input[@id='name'] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('These fields aren', "'", 't required but are recommended')])[1]/preceding::input[1] + + + false + equals + xpath:position + //div/div/div/div/div/input + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs new file mode 100644 index 000000000..f57f705e9 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs @@ -0,0 +1,72 @@ + + + + span_All + + e46b1338-cfb4-4490-afcb-c261879f15a8 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + All + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX kcQtWv"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::span[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[3] + + + false + equals + xpath:position + //nav/div/div/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs new file mode 100644 index 000000000..68d4bcaab --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs @@ -0,0 +1,72 @@ + + + + span_Cancel (1) + + 302d13ea-63d3-429f-8017-1c0869660067 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Cancel + + + false + equals + xpath + Main + id("request-form-cancel-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //button[@id='request-form-cancel-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div/div/div[3]/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs new file mode 100644 index 000000000..5cd570307 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs @@ -0,0 +1,72 @@ + + + + span_Cancel + + d24922ab-3227-4de2-a025-9b61de62c54f + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Cancel + + + false + equals + xpath + Main + id("request-form-cancel-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //button[@id='request-form-cancel-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div/div/div[3]/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs new file mode 100644 index 000000000..35d936862 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs @@ -0,0 +1,72 @@ + + + + span_Draft + + 5e1ee825-c4ed-4fe3-aad4-e969480d9cb0 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div[2]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Draft + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div[2]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[2]/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs new file mode 100644 index 000000000..f04ad3bb2 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs @@ -0,0 +1,54 @@ + + + + span_Login (1) + + 736cb464-f5e1-49ac-b997-9d69349bde84 + + + XPATH + //span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Login + + + false + equals + xpath + Main + id("app-auth-login-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //a[@id='app-auth-login-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] + + + false + equals + xpath:position + //span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs new file mode 100644 index 000000000..8d0b1ce38 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs @@ -0,0 +1,54 @@ + + + + span_Login + + 43ba404e-395a-4174-ad6f-b2c20759c0af + + + XPATH + //span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Login + + + false + equals + xpath + Main + id("app-auth-login-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //a[@id='app-auth-login-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] + + + false + equals + xpath:position + //span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs new file mode 100644 index 000000000..e2c0eb8be --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs @@ -0,0 +1,79 @@ + + + + span_New Request (1) + + 804916e5-5448-43d1-9965-9b4bfe3f5ebf + + + XPATH + //div[@id='main']/div/div/main/div/div/button/span/span[2] + + + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + New Request + + + true + equals + xpath + Main + id("new-request-button")/span[1]/span[2] + + + true + equals + id + Main + new-request-button + + + true + equals + xpath:idRelative + //button[@id='new-request-button']/span/span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] + + + false + equals + xpath:position + //span[2] + + + false + equals + xpath:idRelative + //div[@id='main']/div/div/main/div/div/button/span/span[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs new file mode 100644 index 000000000..512ee9e88 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs @@ -0,0 +1,83 @@ + + + + span_New Request + + 67319848-cfcb-40e6-8718-6ed1d88c2501 + + + XPATH + //div[@id='main']/div/div/main/div/div/button/span/span[2] + + + BASIC + id("new-request-button")/span[1]/span[2][count(. | //span[(text() = 'New Request' or . = 'New Request') and @id = 'new-request-button']) = count(//span[(text() = 'New Request' or . = 'New Request') and @id = 'new-request-button'])] + + + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + New Request + + + true + equals + xpath + Main + id("new-request-button")/span[1]/span[2] + + + true + equals + id + Main + new-request-button + + + true + equals + xpath:idRelative + //button[@id='new-request-button']/span/span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] + + + false + equals + xpath:position + //span[2] + + + false + equals + xpath:idRelative + //div[@id='main']/div/div/main/div/div/button/span/span[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs new file mode 100644 index 000000000..03b281a97 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs @@ -0,0 +1,70 @@ + + + + span_New Request_1 + + c057b988-a971-4de5-80a1-50d6b5f07785 + + + XPATH + //button[@id='new-request-button']/span/span[2] + + + BASIC + id("new-request-button")/span[1]/span[2][count(. | //span[(text() = 'New Request' or . = 'New Request')]) = count(//span[(text() = 'New Request' or . = 'New Request')])] + + + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + New Request + + + true + equals + xpath + Main + id("new-request-button")/span[1]/span[2] + + + true + equals + xpath:idRelative + //button[@id='new-request-button']/span/span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] + + + false + equals + xpath:position + //span[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs new file mode 100644 index 000000000..c0e3b9127 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs @@ -0,0 +1,74 @@ + + + + span_Save Close (1) + + fcb168c3-906b-48cc-8c0d-63697e3b1f15 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] + + + BASIC + //span[(text() = 'Save & Close' or . = 'Save & Close')] + + + CSS + + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Save & Close + + + false + equals + xpath + Main + /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-eMRERa dFsmTH sc-fgrSAo gdmBOU"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[5] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[2]/div/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs new file mode 100644 index 000000000..5953f01aa --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs @@ -0,0 +1,70 @@ + + + + span_Save Close + + 571126cb-8d91-45cd-a433-0545e72d0e97 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] + + + BASIC + //span[(text() = 'Save & Close' or . = 'Save & Close')] + + + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Save & Close + + + false + equals + xpath + Main + /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-eMRERa dFsmTH sc-fgrSAo gdmBOU"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[5] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[2]/div/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs b/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs new file mode 100644 index 000000000..758eef0e2 --- /dev/null +++ b/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs @@ -0,0 +1,67 @@ + + + + table_StatusRequest Identifier + + 66325af3-ebf7-4813-ae5d-9f1d250d8835 + + + XPATH + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table + + + XPATH + false + + true + equals + tag + Main + table + + + false + equals + class + Main + DynamicTable__Table-sc-1naczgt-0 cFUPVR + + + true + equals + text + Main + StatusRequest IdentifierSubmitted OnUpdated OnOutput CheckergfgggggDec 5th, 2018Dec 5th, 2018-Actions + + + false + equals + xpath + Main + id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainerAdvanced__Container-sc-1s2zdt8-0 cFyKDm"]/table[@class="DynamicTable__Table-sc-1naczgt-0 cFUPVR"] + + + true + equals + xpath:idRelative + //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancelled'])[1]/following::table[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/following::table[1] + + + false + equals + xpath:position + //table + + diff --git a/ui-tests/Profiles/default.glbl b/ui-tests/Profiles/default.glbl new file mode 100644 index 000000000..fd43827fd --- /dev/null +++ b/ui-tests/Profiles/default.glbl @@ -0,0 +1,7 @@ + + + + default + + true + diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy new file mode 100644 index 000000000..a3a10f6c6 --- /dev/null +++ b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy @@ -0,0 +1,17 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +CucumberKW.runFeatureFile('Include\\features\\requester\\draft_requests.feature') + diff --git a/ui-tests/Test Cases/Requester/Run cucumber tests.tc b/ui-tests/Test Cases/Requester/Run cucumber tests.tc new file mode 100644 index 000000000..800064d70 --- /dev/null +++ b/ui-tests/Test Cases/Requester/Run cucumber tests.tc @@ -0,0 +1,8 @@ + + + + Run cucumber tests + + + 76fac551-a5e8-47b3-ad4d-73ca4acc6659 + diff --git a/ui-tests/Test Suites/Run OCWA test cases.groovy b/ui-tests/Test Suites/Run OCWA test cases.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/ui-tests/Test Suites/Run OCWA test cases.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/ui-tests/Test Suites/Run OCWA test cases.ts b/ui-tests/Test Suites/Run OCWA test cases.ts new file mode 100644 index 000000000..18253fdfb --- /dev/null +++ b/ui-tests/Test Suites/Run OCWA test cases.ts @@ -0,0 +1,20 @@ + + + + Run OCWA test cases + + false + 2018-12-11T09:12:00 + + 0 + 30 + true + false + b535506e-7ead-48e8-b30a-3efef1a51e0f + + 09de8a8b-040a-4a5d-a823-53625b8804a5 + false + true + Test Cases/Requester/Run cucumber tests + + diff --git a/ui-tests/console.properties b/ui-tests/console.properties new file mode 100644 index 000000000..c89f16f3d --- /dev/null +++ b/ui-tests/console.properties @@ -0,0 +1,5 @@ +#Wed Dec 05 10:12:31 PST 2018 +deviceId= +kobitonDeviceId= +remoteWebDriverType=Selenium +remoteWebDriverUrl= diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh new file mode 100644 index 000000000..ae604c9bd --- /dev/null +++ b/ui-tests/runTests.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/settings/internal/com.kms.katalon.execution.properties b/ui-tests/settings/internal/com.kms.katalon.execution.properties new file mode 100644 index 000000000..59a525faa --- /dev/null +++ b/ui-tests/settings/internal/com.kms.katalon.execution.properties @@ -0,0 +1,6 @@ +#Tue Dec 11 09:06:20 PST 2018 +execution.default.executionConfiguration="Chrome" +execution.default.timeout=30 +execution.default.openReportAfterExecuting=false +execution.default.quitDriversAfterExecutingTestCase=false +execution.default.quitDriversAfterExecutingTestSuite=true diff --git a/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties b/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties new file mode 100644 index 000000000..11075e853 --- /dev/null +++ b/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties @@ -0,0 +1,6 @@ +#Tue Dec 11 09:06:20 PST 2018 +execution.default.webUi.enablePageLoadTimeout=false +execution.default.webUi.pageLoadTimeout=30 +execution.default.webUi.ignorePageLoadTimeOutException=false +execution.default.webUi.actionDelay=0 +execution.default.waitForIEHanging=600 diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.jira.properties b/ui-tests/settings/internal/com.kms.katalon.integration.jira.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties b/ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/sonar-project.properties b/ui-tests/sonar-project.properties new file mode 100644 index 000000000..b19e55a67 --- /dev/null +++ b/ui-tests/sonar-project.properties @@ -0,0 +1,32 @@ +sonar.projectKey=ocwa +sonar.projectName=OCWA Scanning +sonar.projectVersion=0.0.1 +sonar.organization=ajc_bcgov + +sonar.host.url=https://sonarcloud.io + +sonar.sources=src + +sonar.dynamicAnalysis=reuseReports + +sonar.javascript.lcov.reportPaths=coverage/lcov.info +sonar.python.coverage.reportPath=microservices/*/coverage.xml + +# sonar.modules=frontend,forumApi,policyApi,requestApi,validateApi + +frontend.sonar.projectBaseDir=frontend +frontend.sonar.sources=src,server + +forumApi.sonar.projectBaseDir=microservices/forumApi +forumApi.sonar.sources=auth,bin,db,routes + +requestApi.sonar.projectBaseDir=microservices/requestApi +requestApi.sonar.sources=auth,bin,db,routes + +policyApi.sonar.projectBaseDir=microservices +policyApi.sonar.sources=policyApi/db,policyApi/v1 +policyApi.sonar.python.coverage.reportPath=policyApi/coverage.xml + +validateApi.sonar.projectBaseDir=microservices +validateApi.sonar.sources=validateApi/db,validateApi/v1,validateApi/validator +validateApi.sonar.python.coverage.reportPath=validateApi/coverage.xml From f759c79d2413eb30710de425ab2fe28a303fbad1 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 09:58:04 -0800 Subject: [PATCH 079/226] travis for katalon integration tests --- .travis.yml | 918 ++++++++++++++++++++++++++++------------------------ 1 file changed, 499 insertions(+), 419 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9180f213a..c9eed00d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,419 +1,499 @@ -dist: trusty -sudo: required -language: python - -services: -- docker - -addons: - sonarcloud: - organization: "ajc_bcgov" - token: - secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= - -matrix: - include: - - name: "Forum Api" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - before_script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - helm lint helm/forum-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Request Api" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - npm install - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - helm lint helm/request-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Policy Api" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - helm lint helm/policy-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Validation Api" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - helm lint helm/validate-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Front End" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Scan - Python" - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1 -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - - - name: "Scan - NodeJS" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - - cd /home/travis/build/bcgov/OCWA/frontend - - npm test - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - - name: "OCWA Master Helm Chart" - language: node_js - node_js: - - "node" - cache: npm - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa - -env: - global: - - HELM_URL=https://storage.googleapis.com/kubernetes-helm - - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz - - TARGET_BR=gh-pages - - REPO_DIR=/home/travis/build/kubenow/helm-charts - - GH_URL=https://kubenow.github.io/helm-charts - - YAMLLINT_VERSION=1.8.1 - - CXX=g++-4.8 - - MONGODB=4.1.1 - - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - - SONAR_APP=sonar-scanner - - SONAR_VERSION=3.2.0.1227-linux - - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= - - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= - #SONAR_TOKEN - - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= - #QUAYIO_USERNAME - - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= - #QUAYIO_PASSWORD - - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= +dist: trusty +sudo: required +language: python + +services: +- docker + +addons: + sonarcloud: + organization: "ajc_bcgov" + token: + secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= + +matrix: + include: + - name: "Forum Api" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + before_script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + - helm lint helm/forum-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Request Api" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - npm install + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + - helm lint helm/request-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Policy Api" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - helm lint helm/policy-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Validation Api" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - helm lint helm/validate-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Front End" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Scan - Python" + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1 -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi + + - name: "Scan - NodeJS" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + + - cd /home/travis/build/bcgov/OCWA/frontend + - npm test + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi + + - name: "OCWA Master Helm Chart" + language: node_js + node_js: + - "node" + cache: npm + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa + + - name: "Integration Tests" + language: node_js + node_js: + - "node" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + + - cd /home/travis/build/bcgov/OCWA/frontend + + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + + #Install Katalon Studios + - cd /home/travis/build/bcgov/OCWA/ui-tests + - chmod ugo+x runTests.sh + - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz + - tar -xvf Katalon_Studio_${KATALON_VERSION}.tar.gz + - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} + + #RUN Integration Tests + - ./runTests.sh + +env: + global: + - HELM_URL=https://storage.googleapis.com/kubernetes-helm + - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz + - TARGET_BR=gh-pages + - REPO_DIR=/home/travis/build/kubenow/helm-charts + - GH_URL=https://kubenow.github.io/helm-charts + - YAMLLINT_VERSION=1.8.1 + - CXX=g++-4.8 + - MONGODB=4.1.1 + - KATALON_VERSION=Linux_64-5.8.2 + - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ + - SONAR_APP=sonar-scanner + - SONAR_VERSION=3.2.0.1227-linux + - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= + - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= + #SONAR_TOKEN + - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= + #QUAYIO_USERNAME + - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= + #QUAYIO_PASSWORD + - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= From 02d3e5a891307e936de9a7da64c0b53c1df6f5a0 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 10:19:50 -0800 Subject: [PATCH 080/226] travis tar tweak --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9eed00d6..c73e75203 100644 --- a/.travis.yml +++ b/.travis.yml @@ -468,7 +468,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz - - tar -xvf Katalon_Studio_${KATALON_VERSION}.tar.gz + - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} From 308ce9b9c2ea69efedf3bdab74d362fdee46f939 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 10:34:16 -0800 Subject: [PATCH 081/226] run tests --- ui-tests/runTests.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index ae604c9bd..27c6b9996 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1,3 +1 @@ -#!/bin/bash - katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From 8593af26189721c64f9b3ed0f770d927db062fa1 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 10:40:31 -0800 Subject: [PATCH 082/226] tweak to run tests it complained about bin/bash --- ui-tests/runTests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index 27c6b9996..b3193047d 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1 +1,3 @@ +echo "Starting tests" + katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From aea6645965b185e2a279b698c8ad1070989a0784 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 11:02:04 -0800 Subject: [PATCH 083/226] fixed line endings and project definition for automated tests --- ui-tests/.project | 2 +- ui-tests/runTests.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui-tests/.project b/ui-tests/.project index f129bb1da..55d9e666d 100644 --- a/ui-tests/.project +++ b/ui-tests/.project @@ -1,6 +1,6 @@ - C%%Users%PaulR%Documents%OCWA%OCWA.prj + OCWA diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index b3193047d..c2c00e0c4 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1,3 +1,4 @@ -echo "Starting tests" - +#!bin/bash +echo "Starting tests" + katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From ce7838c26eb0d72e46f40fd4dac86457d35f7741 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 11:18:32 -0800 Subject: [PATCH 084/226] removed shebang as travis doesn't seem to have bin/bash --- ui-tests/runTests.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index c2c00e0c4..d9215c0aa 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1,4 +1,3 @@ -#!bin/bash echo "Starting tests" katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From 729907f3cbddfad6c693959aea5a2918fc711145 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 12:02:56 -0800 Subject: [PATCH 085/226] added more time for things to load in automated test --- .../Include/scripts/groovy/Requester_step_def_ks.groovy | 7 ++++--- .../test_OCWA_keywords/random_test_request_name.groovy | 2 +- .../com.kms.katalon.core.db.DatabaseSettings.properties | 0 .../com.kms.katalon.integration.analytics.properties | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 00a0c0453..05305d444 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -75,9 +75,10 @@ class Requester_step_def_ks { newRequestButtonObject = new TestObject("new-request-button") newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - WebUI.waitForPageLoad(0) - - WebUI.waitForElementClickable(newRequestButtonObject, 0) + WebUI.waitForPageLoad(20) + + WebUI.waitForElementClickable(newRequestButtonObject, 20) + //WebUI.sendKeys(Keys.Return) WebUI.click(newRequestButtonObject) request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy index 281c294f2..863f5e131 100644 --- a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy +++ b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -23,7 +23,7 @@ public class random_test_request_name { @Keyword def gen_random_test_request_name() { Date today = new Date() - String todaysDate = today.format('MMddyy-hhmm') + String todaysDate = today.format('MMddyy-hhmm-ss') String engagementName = 'auto_eng ' + todaysDate //return (engagementName) //WebUI.comment(engagementName) diff --git a/ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties b/ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties index e69de29bb..914aee845 100644 --- a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties +++ b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties @@ -0,0 +1,2 @@ +#Tue Dec 11 11:07:41 PST 2018 +analytics.integration.enable=false From f145badbda4d2553e581d9929624b46fb3aef1d5 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 12:22:26 -0800 Subject: [PATCH 086/226] travis tweaks --- .travis.yml | 1 + ui-tests/.travis.yml | 474 ------------------------------------------- 2 files changed, 1 insertion(+), 474 deletions(-) delete mode 100644 ui-tests/.travis.yml diff --git a/.travis.yml b/.travis.yml index c73e75203..02cfb6329 100644 --- a/.travis.yml +++ b/.travis.yml @@ -466,6 +466,7 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests + - rm -rf .project - chmod ugo+x runTests.sh - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz diff --git a/ui-tests/.travis.yml b/ui-tests/.travis.yml deleted file mode 100644 index 202efcebf..000000000 --- a/ui-tests/.travis.yml +++ /dev/null @@ -1,474 +0,0 @@ -dist: trusty -sudo: required -language: python - -services: -- docker - -addons: - sonarcloud: - organization: "ajc_bcgov" - token: - secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= - -matrix: - include: - - name: "Forum Api" - language: node_js - node_js: - - "node" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - before_script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - helm lint helm/forum-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Request Api" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - npm install - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - helm lint helm/request-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Policy Api" - language: python - python: - - "3.6" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - helm lint helm/policy-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Validation Api" - language: python - python: - - "3.6" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - helm lint helm/validate-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Front End" - language: node_js - node_js: - - "node" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Scan - Python" - python: - - "3.6" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1 -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - - - name: "Scan - NodeJS" - language: node_js - node_js: - - "node" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - - NODE_ENV=test npm start & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - - cd /home/travis/build/bcgov/OCWA/frontend - - npm test - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - - name: "OCWA Master Helm Chart" - language: node_js - node_js: - - "node" - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa - - - name: "Integration Tests" - language: node_js - node_js: - - "node" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - python3-pip - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - - NODE_ENV=test npm start & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - - cd /home/travis/build/bcgov/OCWA/frontend - - npm test - - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui-tests - - chmod ugo+x runTests.sh - - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz - - tar -xvf Katalon_Studio_${KATALON_VERSION}.tar.gz - - ls -liah Katalon_Studio_${KATALON_VERSION}/ - - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} - - #RUN Integration Tests - - ./runTests.sh - -env: - global: - - HELM_URL=https://storage.googleapis.com/kubernetes-helm - - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz - - TARGET_BR=gh-pages - - REPO_DIR=/home/travis/build/kubenow/helm-charts - - GH_URL=https://kubenow.github.io/helm-charts - - YAMLLINT_VERSION=1.8.1 - - CXX=g++-4.8 - - MONGODB=4.1.1 - - KATALON_VERSION=Linux_64-5.8.2 - - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - - SONAR_APP=sonar-scanner - - SONAR_VERSION=3.2.0.1227-linux - - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= - - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= - #SONAR_TOKEN - - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= - #QUAYIO_USERNAME - - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= - #QUAYIO_PASSWORD - - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= From 4e4fbf5fa2c97e57461076c5ff85e3d12b1e44db Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 12:30:20 -0800 Subject: [PATCH 087/226] added Travis testing url via Profile --- ui-tests/.gitignore | 1 + .../scripts/groovy/Requester_step_def_kr.groovy | 4 ++-- .../scripts/groovy/Requester_step_def_ks.groovy | 4 ++-- ui-tests/Profiles/Travis.glbl | 12 ++++++++++++ ui-tests/Test Suites/Run OCWA test cases.ts | 2 +- ui-tests/runTests.sh | 2 +- 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 ui-tests/Profiles/Travis.glbl diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore index 91344686a..c295d3bb6 100644 --- a/ui-tests/.gitignore +++ b/ui-tests/.gitignore @@ -214,4 +214,5 @@ venv.bak/ # Katalon Studio Reports/* +Profiles/default.glbl diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy index 88dd0897e..eeaf81f58 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy @@ -41,9 +41,9 @@ public class Requester_step_def_kr { WebUI.openBrowser('') def driver = DriverFactory.getWebDriver() - String baseUrl = "http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/" + String baseUrl = GlobalVariable.OCWA_URL selenium = new WebDriverBackedSelenium(driver, baseUrl) - selenium.open("http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/") + selenium.open(GlobalVariable.OCWA_URL) selenium.click("id=app-auth-login-button") selenium.type("id=username", "xxx") selenium.type("id=password", "xxx") diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 05305d444..caa99a049 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -58,7 +58,7 @@ class Requester_step_def_ks { def requester_login() { WebUI.openBrowser('') - WebUI.navigateToUrl('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) @@ -76,7 +76,7 @@ class Requester_step_def_ks { newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) WebUI.waitForPageLoad(20) - + WebUI.waitForElementClickable(newRequestButtonObject, 20) //WebUI.sendKeys(Keys.Return) WebUI.click(newRequestButtonObject) diff --git a/ui-tests/Profiles/Travis.glbl b/ui-tests/Profiles/Travis.glbl new file mode 100644 index 000000000..feb3f8808 --- /dev/null +++ b/ui-tests/Profiles/Travis.glbl @@ -0,0 +1,12 @@ + + + + Travis + + false + + + 'http://localhost:8000' + OCWA_URL + + diff --git a/ui-tests/Test Suites/Run OCWA test cases.ts b/ui-tests/Test Suites/Run OCWA test cases.ts index 18253fdfb..e4a6e327b 100644 --- a/ui-tests/Test Suites/Run OCWA test cases.ts +++ b/ui-tests/Test Suites/Run OCWA test cases.ts @@ -4,7 +4,7 @@ Run OCWA test cases false - 2018-12-11T09:12:00 + 2018-12-11T12:11:17 0 30 diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh index d9215c0aa..eca6a0d3c 100644 --- a/ui-tests/runTests.sh +++ b/ui-tests/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From 43aedafb13f04ea7e18ff2e2df4a39780351fa42 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 13:04:50 -0800 Subject: [PATCH 088/226] start ignoring local default profile --- ui-tests/Profiles/default.glbl | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 ui-tests/Profiles/default.glbl diff --git a/ui-tests/Profiles/default.glbl b/ui-tests/Profiles/default.glbl deleted file mode 100644 index fd43827fd..000000000 --- a/ui-tests/Profiles/default.glbl +++ /dev/null @@ -1,7 +0,0 @@ - - - - default - - true - From eb87c6eb754f2d8ae407ac4521a82984c00960d1 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 13:10:21 -0800 Subject: [PATCH 089/226] added pip to integration test travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 02cfb6329..da75452ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -405,6 +405,9 @@ matrix: sources: - ubuntu-toolchain-r-test - python3-pip + packages: + - g++-4.8 + - python3-pip before_script: - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz From f776c3fb8b8e402fa0cb0b9befc14906803fc8d4 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 11 Dec 2018 13:13:31 -0800 Subject: [PATCH 090/226] changed how katalon studios is run: --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index da75452ae..f3077ce32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -469,15 +469,14 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - - rm -rf .project - chmod ugo+x runTests.sh - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} - + - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - ./runTests.sh + - ./ui-tests/runTests.sh env: global: From 9e0e1394f293c646a57123902873de11fbc00305 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 11 Dec 2018 14:01:22 -0800 Subject: [PATCH 091/226] added bin and Lib folders to repo (which apparently we need) --- ui-tests/.gitignore | 2 - .../groovy/Requester_step_def_ks.groovy | 4 +- .../random_test_request_name.groovy | 6 +-- ui-tests/Libs/CustomKeywords.groovy | 9 +++++ .../Libs/TempTestSuite1544564949373.groovy | 36 ++++++++++++++++++ ui-tests/Libs/internal/GlobalVariable.groovy | 33 ++++++++++++++++ ui-tests/Test Suites/Run OCWA test cases.ts | 2 +- .../bin/groovy/Requester_step_def_kr.class | Bin 0 -> 6547 bytes .../bin/groovy/Requester_step_def_ks.class | Bin 0 -> 6842 bytes .../random_test_request_name.class | Bin 0 -> 3283 bytes ...s.katalon.integration.analytics.properties | 2 +- 11 files changed, 83 insertions(+), 11 deletions(-) create mode 100644 ui-tests/Libs/CustomKeywords.groovy create mode 100644 ui-tests/Libs/TempTestSuite1544564949373.groovy create mode 100644 ui-tests/Libs/internal/GlobalVariable.groovy create mode 100644 ui-tests/bin/groovy/Requester_step_def_kr.class create mode 100644 ui-tests/bin/groovy/Requester_step_def_ks.class create mode 100644 ui-tests/bin/keyword/test_OCWA_keywords/random_test_request_name.class diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore index c295d3bb6..eb01e3d7a 100644 --- a/ui-tests/.gitignore +++ b/ui-tests/.gitignore @@ -206,8 +206,6 @@ venv.bak/ # mypy .mypy_cache/ -/bin/ -/Libs/ /.settings/ /.classpath .svn/ diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index caa99a049..70de81198 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -75,9 +75,9 @@ class Requester_step_def_ks { newRequestButtonObject = new TestObject("new-request-button") newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - WebUI.waitForPageLoad(20) + WebUI.waitForPageLoad(30) - WebUI.waitForElementClickable(newRequestButtonObject, 20) + WebUI.waitForElementClickable(newRequestButtonObject, 30) //WebUI.sendKeys(Keys.Return) WebUI.click(newRequestButtonObject) diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy index 863f5e131..e5d4f4f11 100644 --- a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy +++ b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -24,10 +24,6 @@ public class random_test_request_name { def gen_random_test_request_name() { Date today = new Date() String todaysDate = today.format('MMddyy-hhmm-ss') - String engagementName = 'auto_eng ' + todaysDate - //return (engagementName) - //WebUI.comment(engagementName) - //return "bananas" - return engagementName + return 'auto_eng ' + todaysDate } } \ No newline at end of file diff --git a/ui-tests/Libs/CustomKeywords.groovy b/ui-tests/Libs/CustomKeywords.groovy new file mode 100644 index 000000000..9457decb7 --- /dev/null +++ b/ui-tests/Libs/CustomKeywords.groovy @@ -0,0 +1,9 @@ + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ + + +def static "test_OCWA_keywords.random_test_request_name.gen_random_test_request_name"() { + (new test_OCWA_keywords.random_test_request_name()).gen_random_test_request_name() +} diff --git a/ui-tests/Libs/TempTestSuite1544564949373.groovy b/ui-tests/Libs/TempTestSuite1544564949373.groovy new file mode 100644 index 000000000..3f196e0ef --- /dev/null +++ b/ui-tests/Libs/TempTestSuite1544564949373.groovy @@ -0,0 +1,36 @@ +import com.kms.katalon.core.logging.KeywordLogger +import com.kms.katalon.core.exception.StepFailedException +import com.kms.katalon.core.reporting.ReportUtil +import com.kms.katalon.core.main.TestCaseMain +import com.kms.katalon.core.testdata.TestDataColumn +import groovy.lang.MissingPropertyException +import com.kms.katalon.core.testcase.TestCaseBinding +import com.kms.katalon.core.driver.internal.DriverCleanerCollector +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.configuration.RunConfiguration +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import internal.GlobalVariable as GlobalVariable + +Map suiteProperties = new HashMap(); + + +suiteProperties.put('id', 'Test Suites/Run OCWA test cases') + +suiteProperties.put('name', 'Run OCWA test cases') + +suiteProperties.put('description', '') + + +DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner()) +DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner()) +DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.cucumber.keyword.internal.CucumberDriverCleaner()) + + + +RunConfiguration.setExecutionSettingFile("C:\\Users\\PaulR\\Documents\\OCWA\\OCWA\\ui-tests\\Reports\\Run OCWA test cases\\20181211_134904\\execution.properties") + +TestCaseMain.beforeStart() + +TestCaseMain.startTestSuite('Test Suites/Run OCWA test cases', suiteProperties, [new TestCaseBinding('Test Cases/Requester/Run cucumber tests', 'Test Cases/Requester/Run cucumber tests', null)]) diff --git a/ui-tests/Libs/internal/GlobalVariable.groovy b/ui-tests/Libs/internal/GlobalVariable.groovy new file mode 100644 index 000000000..51b9af8e5 --- /dev/null +++ b/ui-tests/Libs/internal/GlobalVariable.groovy @@ -0,0 +1,33 @@ +package internal + +import com.kms.katalon.core.configuration.RunConfiguration +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ +public class GlobalVariable { + + /** + *

+ */ + public static Object OCWA_URL + + + static { + def allVariables = [:] + allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca']) + allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) + + String profileName = RunConfiguration.getExecutionProfile() + + def selectedVariables = allVariables[profileName] + OCWA_URL = selectedVariables['OCWA_URL'] + + } +} diff --git a/ui-tests/Test Suites/Run OCWA test cases.ts b/ui-tests/Test Suites/Run OCWA test cases.ts index e4a6e327b..41a580f83 100644 --- a/ui-tests/Test Suites/Run OCWA test cases.ts +++ b/ui-tests/Test Suites/Run OCWA test cases.ts @@ -4,7 +4,7 @@ Run OCWA test cases false - 2018-12-11T12:11:17 + 2018-12-11T13:49:04 0 30 diff --git a/ui-tests/bin/groovy/Requester_step_def_kr.class b/ui-tests/bin/groovy/Requester_step_def_kr.class new file mode 100644 index 0000000000000000000000000000000000000000..a2f422bbd2e87f2019711b1a50b0e033bc47c755 GIT binary patch literal 6547 zcmbtY349dQ8UJ3g$!<0SBm)E@sH>(DHd$9zt4KtFC=f}2l7tAfT_?M<*&(|#ab`AQ zd#JV8YOSqpZEbDU)~eLjwup#{SLvnJUiPr}ec$(e*#5tn+0AUSLH$8~yq)>pcVF*& z^VG8sJw`;U#EF6y?@%u6;J9)UKJ$wPHWq5o0>iXoTfI*R%|WRol`8U zN6#37qP>PW5>FXvHLDb?xMz&1W^yo4GxT^F7xcko5*+%v1&Q5)8uF^GINO4j^!nY< zSK0tg{rQ@%*%t_^ZC|-lBAFJ3DL{(^HMfnZcDItt^=r1e-ZYh>phWx1J=GN|=(d(u z<0;@k**yCiC%C1I+erGgeR%YMhivI>G)+gHw^okS^C09VK zmKMtlBU#0Yfa!>uj%a!h4slwqoz6a_6lsuqzfX-R4{tdO$&u8STQsLBCKU9tz73qrpyhq#hK*2)h^uP0;B&+cJV$+I#%o z^N`R{4H^rRPM0&IMx2T812l+v?8|<#C7MqQ*uCR|&Nx=UOQB{FW=2V=tAn%;ojI*p zT$E|_Y(1@*X)O;xucvc00O`w!phX>lc8#p(GP ziNe&#dcT&>O^7z~Zly_d4V}gZ!s}SzJUEL@cfx<2pk=&kgk1y?1VwvtA{9xK?%jFwYz3PpXv#&*QrjX1jz+lcsN3R*F( zAkLAbZrI7P29-HD&y*m6kJyQU>nLh=h~?=JYg{dX0Mqg|FC-( z2s#DsEoD{4F!M1+jiqvirIxeooj^+&dPXzz$+W3tU=xs%6EM&!q*AJ7WeO;oIaC^O zRT`M766UO2Ix?(AIRDs@rW(Uxp!>ZLL1sk8wA5&%Fcz7}swNP#YB7>iGj_ztWY~x% zUYaY4ZG&OtR7DTc?ObBJ{UzpYIVJYKFuj-VU~*Z|e5Y0mww8-uq}Vv6?vkj-J(CVF z%0lFRUtc<1EXK0gd_F`UWGJSn2J|l@sp=z<5PcXUg>9sHkZN)pc9|ijjj*$2F?+}Z zg)*Y%QAb;yc`?Mp7>|XRqAG?Nx64X&KON@5?Eyjac%buDYDbkeJ@>@*AWd>>o{~tS zd0c}J3u>?0JF3i}L3$JwTT<1XVAuM^m(GOe%Mg+H7#$7MWAt&CaoH}3KFPD;WArI( zSgPOP6Ds>onWSswPT*?#xG|~%m^IQf#wYKve_n?vcOi&gTy?Gv(r2IZ-)?8=_y}9=xr4Xnk^UM{kIJ1?|soL&LYc5w-1t5d8+%5#|!2 z-=W8)a_Gq+`U79pFerxTPoSAlG<&0AZbw(^H580te+khwA=-=9jO((NDGsRnkXx#S zmKUObU>f5CN5S*Iz-KI1utM}7+~lg6C+Hj`L)D%#*A>dS&~|Z?UM$g1=%*-Wfjdy* zg)<2X4E`0R;5NCc-o^!6)P+Sr)Jyau`Z4;ez!!(xAYoSc}AxgoK$yG>Ul= zJxl*%g>gbxo)apZS7s?qZQx+yGr$5P)u61b8qukdCFh+5n%; z2yL&Xt6QCGv+9&>R#8p?8gAU&Qgk zA(=q4JWEPRuot4M=iYsCq`JsqA7P!#^_0A?q=7o$O3nskcO6?7)uNUP`$N{D5^ zZG@NF@c%^?$OO;DuEQ{J1n@^xbRCw1!)hnVESX`sDi+-LLo{&(Mqt;%RBP8EgmYl#FOAfJQF`IF{k8wS41JpB<;adQH>v1sLK9k|w!0@Ir z!*wu+HEeOCeX|>mcg;#bHx!Fz={s0v|90?2GQ9&ox0Kmm3X_<9)MbC`jAXhE?;Lp~ z*!$;*e!EX3&t?JIjp*+wi+#5%_C5H)9nxzXx5Fwf`Yo>5I}`HVQ}lrvlJ9oP_im@$ z?@4sZA94)!)%(2(`6DQIvz`>#DF7!$CNQRUM9;YWf0@;&T zAMF4RcTr~eBz?x)Z-u_xb>~6$Q_+sjDf(gnCc0=()0aH7rC#nxF4`1*wYH4)41H}* zX5S3JPyA2Nx9Hm*S~K3*h&re|;K;)3cj&v`c7@6VCGzjl_p6ZaFOmO%eprosziV-r z=L2v5dYHn}uZ+qogv;)b> ze+9&Hp0AMqhUaUY-5cb;eyf9XoBU5e?sPccBmW!E_sak6FDZsOz*Fp0gn|`o z!A literal 0 HcmV?d00001 diff --git a/ui-tests/bin/groovy/Requester_step_def_ks.class b/ui-tests/bin/groovy/Requester_step_def_ks.class new file mode 100644 index 0000000000000000000000000000000000000000..86527bfc8ec96fe1b2b1fec6a80f26e53fab5d8c GIT binary patch literal 6842 zcmbtZd0-UP8UJ3g$u7wPVIV*daVb9kJJ@`~ivxj2Htrpqm*t9dC%Nlddy+NP!tZx*yzm*XCluA*%lx=UWr+CnAc%srQcy!$wd_8lZ=wJnpB?o%*>jF>$FbMuR^N^X6Q)(Px`CcU&ka)pHL?b4 z!W4GDS_Lg+b0r=3mCY-tCE8lW@?mPDwQQI6FfAa3>BR*F>=DgkcU6pAxNE)_MaYkw zF|6r=7Jc_Lj*7xP2XjH?AL?m$RAzFixWI_T7msktJ|v7}5dGNM`$&>WVT zh^E&fAqm#1=%H~rRMg_5a$?*tGw}gA)US0FwVb^}?{W8#u;&PBKc2g0MM{t$R)Dt! zZ9Kk{JS8jW9i}aGUL&1L=d%KWml`Ok>4*hg&BeFpj3G6*S2ZJhZb-Hl9d$M>ki zGPS#VpfhrT9FsYtke9k0*(*(p)7~nmdMd#Y5TczXCUg`y1P(?H_N1Q}#BVwe-)wre?igv2sVms$$#4sZ=uWGqe(b)-6Kgv@98Jd$5 zAsP^LQ3WHHTI4CMY>Xu{y&Dm?4X#v2CSDc@n%7-K&(BX6 zzgI9Xr#8G2k#f8;Xv3f*s-DSV*oY@b4AW*4U+C=w=~akAw|%(-$%(6zH@Jl9HT2pB zdNsXn#^mIl2I&nfy28ssLEEdOO4aJ)CVQ_tJVkaP;hhO8L~j(drX0B`bd;2C*eR=9Xta6zX`Q&KY-D`gaIt}$6HC($EY%cl{XM%=@QbI3)h z8YK&(*D<+vO668LFyeH|l|D++j5zpAT{BCPvK1EzTHy)Qp2dXM&T#E%p7F|g`7Q=* z=4CN2O9ZV<8+ukV^QnxfW??7bq{d-1tC&tp%gPqf3#&-i=Sr76M!FHBn9D?lWQ6-0 z+rgCW=xeCc)0T}Ox*`QFJsK$%BI6^{1mK9Ah~#9}ju_c23%8UPjBFtu0(l(8gfnB% zaQjM_-b?rJ!1z8vb9s>T%|2}v(!2UJ^a1)HPgfrb(_EUz)6hXd(TbT>I( zRCjXT;%8qP>z*w^Wcz(|e*+z+BQD{xUSXQ#x$Q7b;lPr9g_lLE%zCYR0jud_#;63H z5d-Ca#)RXg?6az3JTiiHbH#Z+NJmfDSx<&pm>#B&H`2%G6M`CH-YPSaN77$4y_$QB zqTa4g(dwvSdXye#-k$<*79^B{rTkvanbdB}h+8%>Rp5r%kEavfGcA+Q3cuG9RkXl8s#5 zx=dpnb7qLXi!!9EW7;ri^cnqTE=1o)5#vUd>hDd2=!dxaq;sf!A^I^IcUIFg)3yxJ zPcgzkvp#vH9ipG3bK=KVJ#9|lG6_K5{U!W-?rIcn%bTrMpBJKEBSz7MN--Lu-{NMy z_2T}{L^4Fb2gbOn*)S9j^$A18?Da=nOT5jkImxqqH;ct(J4AmLbRl0EocTZHU9_xq zCJMKaPdO)EvvKD%-jE>i!-bHT|I3DVOTA^ch6mhOt)$8!a)KJ<(bVfrS03tdChqG3*t zrn5pUDC+Rifd~(aAf4GD>P09_|DbV&LNm z2+wT`@k;}KJ^uE@9-zgOv@D@4-?=uHx}R389T2o(Q3)G^HZmb!s^K~9K8Si@iypl!5)I(U!HpflkFX8R=7fickmX4$4}>`*o- z%cto1wKUMCbmCW=($%3{Fhv)l6?)q{ob8J`l!UTtih66y2TA9kj}P`b2g)T=bXkB& zUG5z11-CRcpXjQwS>Re(0bo?EDu&ZjQwqp@_G1omPKddPqwV@Qw}20Ay?m#4ke=OpQ3y%?Of}(XLK!u);nVNQB*0k zDOYqTmSY2De_)a(rs&1>tku;Jy=lcHT~jj6wb)=BZ`0NNI&ZTCbbW_%!xY_EL%Z51 z>GenHCdbX~pm(!liUVwlH#w#Ntrd=)W}D-n&m1cdh5_oqOqYNWc2OVgK|uA=1ilX7 zIp7$R48tUEE}NtSzc>U!Y!We>QN52*JzxVgcr3xUVEe8A2f=;E5_}s7zP(KF1~`oi zUcc+KTi9v0R&ZL3opu{LEyhl}z3jAG{Z6~Xbw|u`$82?zK6U4TZGeVg*EH;!DNFed zh=aukk2RO|0Gzmp_Lted$7OqG zQ-B{dy~1$@0GaI?r2qSsnmZ{30X}^25Z#+-dz|L;?j$`hm^e)LwjH4dIjg8i@MP@~ zSOs*v7t<2hZT;Y56gW5#8$>BV5#gN@!b9{C4?*!b*2mfa!&Qa}K1`2z=PeMN-8C1y zKN@RWJ4K&_wjS7{^q2>>6hJI^*ae%SPuG^Ao}kZECHDCMIXofs7wC%~*aG}wCF(e1 z9A5bOBz?&{o+0vz68e|vD;3bACG@Y-*D9e$OXy#(h#o7Uf1@&b%r#g8_im5;J+K4| ze@jf+sC+LOQ#zF&VC_e+W8()euI5o z`5o3Pls{m-TKN;!Yn7+4UgtnwulyC?H#^i0I9RthShqP?w>wyOIFNTaxOXdmPnN_+ z2lvEY2|u&g&C0(Xrki>YcK>;Zo*7hXVh@NK*WV5NKN24JnVy!>Ln81PEx>w2%sC2# gp2ta<6pcL(iTXjH&O0muvHOJL*-(^?7A{_6pD15!5iW&6|d?RCdo# zJKq)R28PaR8uz$jq%~&Qs;y;53aVwD)#nU`M9MJdm8_BDd9`FIo&l53709S&=*k-J z07E2`Aq`_A4D2#PeUaO$LuS~T^1C)xA&^Y%pr&i~5JOG8XHr5VnxY7!nV}^%&+QSl zP)KVwA2v<3%+Me2nF)5Nq}y7ND_P>Vh+nA)4oHx(DT)v_Gi(wn(@uzME-Ux3RJc42n|on`||l>vCp#Vu#ZwHqGUMybQ^9D1smCq z10vYx8IC?JSes(WQ$rUt>ezJNFl`at8Sf;5LkyA|b=o$G=fB~0`KY{);Aj+wLABx= z3NAH*Vw)7M6kF&;BE0Lqorq(cr|^=Sm2~5Z{!}U zLJw^p{?)5cOeiwFC2+(>@EXH8f8d@XpX&7(lQ4tV8<2s@&_M8BFpWiS+Eh%B37IEBYw`R#(m&aaHr*z#}#3Hfrd#;Ob*{> z+ToL+?Wm-UIr|cy<0jX$oZ6~2mNhx`RAnzY3oSzK~4K+P9kER<-Bm1uVaDQ7rH-5FTj)h55=l(R@`Bp6r}h4m(F-SsPp;BAIS zlH#^oV60;6zZ=CncuztRy6E%|7&;zq!zTcZ;6u7FQ1wap2%S;fz{e7<;SJ&Nr_>1n zId(4>p9$X2X#lG3g<|jeuM=P5t9tVFYf8WfEiN%64Jw97)zsA40-q2M%3ey-`T0_D zmYd#5`z06lNzKxTWq56aQ!1lrqhx0JDXqZKMKOeFk=G*J92JufXugRk8t8ppTtny` z6*$pkZx9O~P4xVh{v9AmG4ERwzoTUZTT+QTXdmlMWPU?O@6<0uVfc=o61~G{!FKF$ z&YnRhNeT@&NIp#OAt9ZVyZYtsRrG`)cdtOXhwic7sieHOzgO;G#lae^VDKJ>&iB#b z@qT%@&pBLX%cLRXSla3MGw4}rLkuS{LbN{e`6ON>>i5Lk=vZyXHu@>(zz=j*OFr(T zNWv!-LqDS~v4XMXTNqCzAD~H`uHdEV)NPC>@8D(OhPX)5aP|~* zlQ^Tpt%+aJF?}E5<*CFpVMO?dlZwDJE_(v9XR$VsBp!jFP&k8EJbF8!B@o|8wqH#o zdsi_VMnz2)IghQ4n1th!%eIR7nl-LGw5rMqVYoJLw38`lZ3ZyXII`y=@iLgZh}^Nc9~ literal 0 HcmV?d00001 diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties index 914aee845..20d3d6ab8 100644 --- a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties +++ b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties @@ -1,2 +1,2 @@ -#Tue Dec 11 11:07:41 PST 2018 +#Tue Dec 11 13:13:12 PST 2018 analytics.integration.enable=false From 510f89a086bff08e35a37adc6e60b3374cc3678a Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 10:16:41 -0800 Subject: [PATCH 092/226] added some classes we need to run Katalon studio scripts successfully --- .../Libs/TempTestSuite1544564949373.groovy | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 ui-tests/Libs/TempTestSuite1544564949373.groovy diff --git a/ui-tests/Libs/TempTestSuite1544564949373.groovy b/ui-tests/Libs/TempTestSuite1544564949373.groovy deleted file mode 100644 index 3f196e0ef..000000000 --- a/ui-tests/Libs/TempTestSuite1544564949373.groovy +++ /dev/null @@ -1,36 +0,0 @@ -import com.kms.katalon.core.logging.KeywordLogger -import com.kms.katalon.core.exception.StepFailedException -import com.kms.katalon.core.reporting.ReportUtil -import com.kms.katalon.core.main.TestCaseMain -import com.kms.katalon.core.testdata.TestDataColumn -import groovy.lang.MissingPropertyException -import com.kms.katalon.core.testcase.TestCaseBinding -import com.kms.katalon.core.driver.internal.DriverCleanerCollector -import com.kms.katalon.core.model.FailureHandling -import com.kms.katalon.core.configuration.RunConfiguration -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import internal.GlobalVariable as GlobalVariable - -Map suiteProperties = new HashMap(); - - -suiteProperties.put('id', 'Test Suites/Run OCWA test cases') - -suiteProperties.put('name', 'Run OCWA test cases') - -suiteProperties.put('description', '') - - -DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner()) -DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner()) -DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.cucumber.keyword.internal.CucumberDriverCleaner()) - - - -RunConfiguration.setExecutionSettingFile("C:\\Users\\PaulR\\Documents\\OCWA\\OCWA\\ui-tests\\Reports\\Run OCWA test cases\\20181211_134904\\execution.properties") - -TestCaseMain.beforeStart() - -TestCaseMain.startTestSuite('Test Suites/Run OCWA test cases', suiteProperties, [new TestCaseBinding('Test Cases/Requester/Run cucumber tests', 'Test Cases/Requester/Run cucumber tests', null)]) From 43940a1f45813a5b55719401596860fd22266263 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 10:17:14 -0800 Subject: [PATCH 093/226] same comment as previous commit --- .gitignore | 416 +++++++++--------- ui-tests/.gitignore | 215 +-------- ui-tests/bin/lib/CustomKeywords.class | Bin 0 -> 2440 bytes .../bin/lib/internal/GlobalVariable.class | Bin 0 -> 3510 bytes 4 files changed, 210 insertions(+), 421 deletions(-) create mode 100644 ui-tests/bin/lib/CustomKeywords.class create mode 100644 ui-tests/bin/lib/internal/GlobalVariable.class diff --git a/.gitignore b/.gitignore index 582f48e92..855dcf914 100644 --- a/.gitignore +++ b/.gitignore @@ -1,208 +1,208 @@ -# General Ignore -#bin/ -.idea -.DS_Store - -#Helm -helm/ocwa/charts/* -helm/ocwa/config.yaml - -# Golang Ignore - -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - - -# Node Ignore - -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - - -# Python Ignore - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ +# General Ignore +#bin/ +.idea +.DS_Store + +#Helm +helm/ocwa/charts/* +helm/ocwa/config.yaml + +# Golang Ignore + +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + + +# Node Ignore + +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless + + +# Python Ignore + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +#lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore index eb01e3d7a..36e75220d 100644 --- a/ui-tests/.gitignore +++ b/ui-tests/.gitignore @@ -1,216 +1,5 @@ -# General Ignore -#bin/ -.idea -.DS_Store - -#Helm -helm/ocwa/charts/* -helm/ocwa/config.yaml - -# Golang Ignore - -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - - -# Node Ignore - -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - - -# Python Ignore - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -/.settings/ -/.classpath -.svn/ - # Katalon Studio Reports/* Profiles/default.glbl - +.classpath +.settings diff --git a/ui-tests/bin/lib/CustomKeywords.class b/ui-tests/bin/lib/CustomKeywords.class new file mode 100644 index 0000000000000000000000000000000000000000..e35c7625d27b56f6bd4897607c207ced44826497 GIT binary patch literal 2440 zcmb7GZBrXn6n<_<*<`ydVR^AFtrd-sY%D1O>kG6B(F#o{+Efs+#$|H}3&}3sY*2ne ze~90)?eJnp$4_>~ALV%N?k0p`VeDk)ZgTH=dCqg6b2k6{`}>~&#?fTBoNqQcC$6zs%A@uV{W?=x)=sd+K%~V42fjJ)m_ub*YrkX-deXAw4&`) zvxZ&a8+x;m4FWoRy~YjKw5@F0c8WnNmnp(Ro`HSO&^>KhrhAW}E0tbSAmgHpC=`a? zWR<&ly;dukE}wB6eU~AZO0R~eYFe&Y=UId78)TntIZi3Kj2;;gBp9OZhS{J3iYF^0 zOjlCHP8McOt72N!DIZb4Kr}$W4cl`0FD_9NYE231x@j>CrdEra`i>q@>N@Duh@!B?bBwS~>b)NaDdL_I~FvK>)gH#8K#kEbki>d#!lRj;v;2jKK z#7(?Q(RHUvEcS)eNVn)TiGco8NDPKKmp9zrya}NpbLi#$8g}b;kg?(IIUbPuY^a z?mpt{+~JnNiK4-z;c(sM`A)Yo-Ey3C?K2z0BE$9b)EUD!q_XKGjf zZ~iu@!-^ADdTB-T)F1TvE7~NICEYRgwHkjc7P`HnY4L~6`WknF9l2yT9fRLDYaGLb zGb+eW$f6m5#52SYr>86!pp!Vwd3u%6`jmc+(la7-^@bYJj__U- z%g2#Keo*ct-uLp4cwhzS5jqi|W5S>9u|4m+g&9=1k2#K1+h>9hi+DriQ_$3OPE)m< z`oR%yM{tB(1g$U)GU_JNC}N2yCNN3gMbZgMDUyzA`}kCi{EC=%h|l+)W44%ijUKUk zh`E*G3(RKrQ4p8}=_K|bz|86C3`46lV zDAnpKJXs-{4)9YeHvN4F%qN4`spnYx8@;sdqxu&)6kbC;gjsln$_lyGUSLgoiES?e L`MQ)Mf(!ovcZY>G literal 0 HcmV?d00001 diff --git a/ui-tests/bin/lib/internal/GlobalVariable.class b/ui-tests/bin/lib/internal/GlobalVariable.class new file mode 100644 index 0000000000000000000000000000000000000000..67d8e66bc00c8743a6060f8689a3b7d558952a5e GIT binary patch literal 3510 zcmb7HYj+b>6x}yXn=~Dy41zpFMXOCGZBq&Y@=$9PgrAAbR`3116bVU<18 zE$eo6ukB3f_7UB+^eNj+KnQdm(`WUpt(T{>2d9pihL=E#z?x~-ac1WN`Ck9KzS}CW zYN?<8Kv^JpaCm%Z^6tYq0X6qezdISLtLo{VWenSTwYsldbOf}V<4$J{r(l-!S~VMn zb{&Br)}Vfs`q{eSP6d}^RSGez7Fa1= z=6#5ZDG01h_cX~)!5XZUw(AsJhUM-2x>6wSm8>ewa!rnnppv@`JA}2VA%9`IdBe3T z-feT9DH$Fr=oMas1U8a9!!>o!9MvlVUFoA2pH@#Gs(F^3r515shprT^#q}+`SKwh3 z%%Wbiy(H2}BnA3Po>$qC%{s;jz0W8VtiFQn^%cz7{)+CEidMN`y8YA6Z2y$eZ|F&6 zX!38lUqp2ReI!SU1@@;e&iMaGLR69KPGDIKbf6!bBrsM)+nB4*TGb@BNI^_4tcdOZ zD`FG>+ok`TSU4d^wnG>tr|Rw4J}@wl#7-F`F0k2fX0pd;s@dbZr`x>!hU4FIx4PH zv~2T$K4UIzHDMH1ch!^~#4JS2lCt1s>tUs`CNDH7U&z$*7?aK6Zh>X8x*|24X~=Km zo}*wK_sB|_P>@20gm6?K-H`4EeJ+9f3AmnW&?R?A!w1>+H11Ok91_?h9!%i@=z-%! zTnY@?e;z=A8&xw3cwM?l&+0isU8_9n95?BwRQ5a~VSIu+CP*!7nbPw28iw*LScVu%23ZmOUHSH_l?mqcHP z-5ovI=5R>*O;OFJ!6WI^dFRxt;e?F-u)t+qvVlfM-iC+;$8I+76urY{(R9tSVRF>0 z?g}QwaMWya6E~JjjXHKF+ES@;C_KSlU9oFyqfZI6lJ6l3PqOm(dB?-1!NKB`$%Cxp zB%T$xyip*5t*q3BrPFL8`=i`%s0js+;c_N%FEg&6^Vb%7kRxEV z_5)VV^KGY{$NJG;ZSs3;=pFxtI|5&DRrohftE+G|e40jKz zw=Cec80K;3uh^f<`0hpqwTy2*+Ux($4fd*!;RL#I z2zL?Q3%CM@DU0Dt%GZ%pP?F-iQNvnx@Aa6&2AslGopJe=3<=y!{TMa7N!$@N_BE2) zJnlXFE$+)@e#detoyXKf?i}vRoQHXqs^}DQ7=#Y4qq&fwwC}KC;y1+4j%yP<1Rj8t z)D4Q54h_^WVw;wsjyxjiummgIU(4f=N4ku$k7=3S1vqik-Bj>UsJ4bmGI1qPTY%TH zs8z#kQ)hE=1Tj;x;zPA=p5c4lb`t>X!{lOj3Mzig1EdE literal 0 HcmV?d00001 From b110ab1a66f219b23c4186a85a405447b54e8a62 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 14:48:00 -0800 Subject: [PATCH 094/226] Commented out the the GlobalVariable class reference --- .../Keywords/test_OCWA_keywords/random_test_request_name.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy index e5d4f4f11..c63222c61 100644 --- a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy +++ b/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -16,7 +16,7 @@ import com.kms.katalon.core.testobject.TestObject import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable +//import internal.GlobalVariable public class random_test_request_name { From a48dfb2953b2fc7a1f6d325352fa4ae8e1229570 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 15:15:36 -0800 Subject: [PATCH 095/226] changed the path from backslashes to forward slashes --- .../Requester/Run cucumber tests/Script1544053608217.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy index a3a10f6c6..f28816a4c 100644 --- a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy +++ b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy @@ -13,5 +13,4 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -CucumberKW.runFeatureFile('Include\\features\\requester\\draft_requests.feature') - +CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') From 0048364a8bed13abedadda2499751382a84dee0f Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 12 Dec 2018 17:07:25 -0800 Subject: [PATCH 096/226] updated the version of Katalon Studio to install to 5.9.0 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3077ce32..33548c927 100644 --- a/.travis.yml +++ b/.travis.yml @@ -470,7 +470,7 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh - - wget https://github.com/katalon-studio/katalon-studio/releases/download/v5.8.3/Katalon_Studio_${KATALON_VERSION}.tar.gz + - wget https://github.com/katalon-studio/katalon-studio/releases/download/${KATALON_VERSION}/Katalon_Studio_${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} @@ -488,7 +488,7 @@ env: - YAMLLINT_VERSION=1.8.1 - CXX=g++-4.8 - MONGODB=4.1.1 - - KATALON_VERSION=Linux_64-5.8.2 + - KATALON_VERSION=Linux_64-5.9.0 - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - SONAR_APP=sonar-scanner - SONAR_VERSION=3.2.0.1227-linux From d227208b0085552546f387ebb2c2d5c1c841323a Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 13 Dec 2018 08:58:42 -0800 Subject: [PATCH 097/226] fixed path issue with installing Katalon --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33548c927..1691f971b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -470,10 +470,10 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh - - wget https://github.com/katalon-studio/katalon-studio/releases/download/${KATALON_VERSION}/Katalon_Studio_${KATALON_VERSION}.tar.gz - - tar -xf Katalon_Studio_${KATALON_VERSION}.tar.gz - - chmod ugo+x Katalon_Studio_${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_${KATALON_VERSION} + - wget https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - ./ui-tests/runTests.sh @@ -488,7 +488,7 @@ env: - YAMLLINT_VERSION=1.8.1 - CXX=g++-4.8 - MONGODB=4.1.1 - - KATALON_VERSION=Linux_64-5.9.0 + - KATALON_VERSION=5.9.0 - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - SONAR_APP=sonar-scanner - SONAR_VERSION=3.2.0.1227-linux From bda3139c674358d4f02519c26101566149bb84ea Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 13 Dec 2018 15:04:34 -0800 Subject: [PATCH 098/226] printout the classpath file --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1691f971b..c9ef7bd32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -475,6 +475,8 @@ matrix: - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ + - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath + - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests - ./ui-tests/runTests.sh From 2c79b8097bd73d68a412e79cfdf45f39ac5a649d Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 09:41:11 -0800 Subject: [PATCH 099/226] Add a test suite to debug the Katalon integration --- .../Script1544808549240.groovy | 21 ++++++ .../Test Cases/Requester/test_case_testing.tc | 8 +++ ui-tests/Test Suites/TestingTestSuite.groovy | 66 +++++++++++++++++++ ui-tests/Test Suites/TestingTestSuite.ts | 20 ++++++ ui-tests/runTestsTesting.sh | 3 + 5 files changed, 118 insertions(+) create mode 100644 ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy create mode 100644 ui-tests/Test Cases/Requester/test_case_testing.tc create mode 100644 ui-tests/Test Suites/TestingTestSuite.groovy create mode 100644 ui-tests/Test Suites/TestingTestSuite.ts create mode 100644 ui-tests/runTestsTesting.sh diff --git a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy new file mode 100644 index 000000000..20c39440a --- /dev/null +++ b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy @@ -0,0 +1,21 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +WebUI.openBrowser('') + +WebUI.delay(5) + +WebUI.closeBrowser() + diff --git a/ui-tests/Test Cases/Requester/test_case_testing.tc b/ui-tests/Test Cases/Requester/test_case_testing.tc new file mode 100644 index 000000000..a2198ee2c --- /dev/null +++ b/ui-tests/Test Cases/Requester/test_case_testing.tc @@ -0,0 +1,8 @@ + + + + test_case_testing + + + 2e88f452-f251-4bbb-b9a2-876eb3eecea1 + diff --git a/ui-tests/Test Suites/TestingTestSuite.groovy b/ui-tests/Test Suites/TestingTestSuite.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/ui-tests/Test Suites/TestingTestSuite.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/ui-tests/Test Suites/TestingTestSuite.ts b/ui-tests/Test Suites/TestingTestSuite.ts new file mode 100644 index 000000000..cfaf2f9db --- /dev/null +++ b/ui-tests/Test Suites/TestingTestSuite.ts @@ -0,0 +1,20 @@ + + + + TestingTestSuite + + false + 2018-12-14T09:32:19 + + 0 + 30 + true + false + 37beaa13-ec79-424e-aaa5-703cc753aa44 + + c0b18a0a-46ce-4d12-a377-bd30fe71c1b1 + false + true + Test Cases/Requester/test_case_testing + + diff --git a/ui-tests/runTestsTesting.sh b/ui-tests/runTestsTesting.sh new file mode 100644 index 000000000..76ff80ecc --- /dev/null +++ b/ui-tests/runTestsTesting.sh @@ -0,0 +1,3 @@ +echo "Starting tests" + +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/TestingTestSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From c671d4413b2630159ea885e1040e6aea6d911cfe Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 09:58:52 -0800 Subject: [PATCH 100/226] update the travis file to call the new test testsuite --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9ef7bd32..269a37d6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -478,7 +478,7 @@ matrix: - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests - - ./ui-tests/runTests.sh + - ./ui-tests/runTestsTesting.sh env: global: From 1e7d3057ddda21480365b353ace1a75541f4e26a Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 10:19:50 -0800 Subject: [PATCH 101/226] added execution permission to the testing sh file --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 269a37d6c..8d2a1014b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -478,6 +478,7 @@ matrix: - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests + - chmod ugo+x runTestsTesting.sh - ./ui-tests/runTestsTesting.sh env: From 3cfaa5a36c415360810895efcac9cc95a70f840e Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 10:36:40 -0800 Subject: [PATCH 102/226] fixed path for chmod-ing the testing sh file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8d2a1014b..4ba107768 100644 --- a/.travis.yml +++ b/.travis.yml @@ -470,6 +470,7 @@ matrix: #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh + - chmod ugo+x runTestsTesting.sh - wget https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon @@ -478,7 +479,6 @@ matrix: - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests - - chmod ugo+x runTestsTesting.sh - ./ui-tests/runTestsTesting.sh env: From 2f8325c9390d3b8bc90f9d95678fbdaf02922f1c Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 11:09:19 -0800 Subject: [PATCH 103/226] added display setting to deal with X11 error when running test suite --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ba107768..ce512545c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -476,9 +476,8 @@ matrix: - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ - - cat /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath - - cp /home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION}/.classpath /home/travis/build/bcgov/OCWA/ui-tests/.classpath #RUN Integration Tests + - Xvfb :0 >& /dev/null &DISPLAY=:0export DISPLAY - ./ui-tests/runTestsTesting.sh env: From 1acfac65f72599726fe090c167411a98e9862ba7 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 11:33:32 -0800 Subject: [PATCH 104/226] travis tweaks --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce512545c..494814263 100644 --- a/.travis.yml +++ b/.travis.yml @@ -445,7 +445,6 @@ matrix: - NODE_ENV=test npm start & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - cd /home/travis/build/bcgov/OCWA/frontend @@ -471,13 +470,14 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh - chmod ugo+x runTestsTesting.sh - - wget https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - Xvfb :0 >& /dev/null &DISPLAY=:0export DISPLAY + - Xvfb :0 >& /dev/null &DISPLAY=:0 + - export DISPLAY - ./ui-tests/runTestsTesting.sh env: From efb8fba5833c021c375d8277697aa2c85476acb7 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 11:55:48 -0800 Subject: [PATCH 105/226] running katalon with sudo because chrome needs to bind a port apparently --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 494814263..0ac46cdec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -478,7 +478,7 @@ matrix: #RUN Integration Tests - Xvfb :0 >& /dev/null &DISPLAY=:0 - export DISPLAY - - ./ui-tests/runTestsTesting.sh + - sudo ./ui-tests/runTestsTesting.sh env: global: From e9a75a26c8ce3cb731b0c69e9d4abac338af9e2d Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 14:53:24 -0800 Subject: [PATCH 106/226] attempting to fix sudo environment vars --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ac46cdec..92f68ab4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -478,7 +478,7 @@ matrix: #RUN Integration Tests - Xvfb :0 >& /dev/null &DISPLAY=:0 - export DISPLAY - - sudo ./ui-tests/runTestsTesting.sh + - sudo -E PATH=$PATH ./ui-tests/runTestsTesting.sh env: global: From f8fa8350c16110594a96ba4e4be1418363e1369c Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 15:09:09 -0800 Subject: [PATCH 107/226] Added build stages --- .travis.yml | 91 +++++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92f68ab4c..26262fbde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: matrix: include: - name: "Forum Api" + stage: "APIs" language: node_js node_js: - "node" @@ -61,6 +62,7 @@ matrix: condition: $TRAVIS_BRANCH =~ ^master|develop$ - name: "Request Api" + stage: "APIs" language: node_js node_js: - "node" @@ -129,6 +131,7 @@ matrix: condition: $TRAVIS_BRANCH =~ ^master|develop$ - name: "Policy Api" + stage: "APIs" language: python python: - "3.6" @@ -170,6 +173,7 @@ matrix: condition: $TRAVIS_BRANCH =~ ^master|develop$ - name: "Validation Api" + stage: "APIs" language: python python: - "3.6" @@ -219,48 +223,8 @@ matrix: all_branches: true condition: $TRAVIS_BRANCH =~ ^master|develop$ - - name: "Front End" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - name: "Scan - Python" + stage: "Tests" python: - "3.6" cache: pip @@ -303,6 +267,7 @@ matrix: - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - name: "Scan - NodeJS" + stage: "Tests" language: node_js node_js: - "node" @@ -381,6 +346,7 @@ matrix: - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - name: "OCWA Master Helm Chart" + stage: "Tests" language: node_js node_js: - "node" @@ -397,6 +363,7 @@ matrix: - helm lint helm/ocwa - name: "Integration Tests" + stage: "Tests" language: node_js node_js: - "node" @@ -480,6 +447,48 @@ matrix: - export DISPLAY - sudo -E PATH=$PATH ./ui-tests/runTestsTesting.sh + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + env: global: - HELM_URL=https://storage.googleapis.com/kubernetes-helm From 38d23708e97457702a4d41eb1d7c62a9b7ed4f7c Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 15:33:20 -0800 Subject: [PATCH 108/226] changed how xvfb is run and installed chrome --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26262fbde..4f0ed12d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -368,6 +368,7 @@ matrix: node_js: - "node" addons: + chrome: stable apt: sources: - ubuntu-toolchain-r-test @@ -443,9 +444,9 @@ matrix: - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - Xvfb :0 >& /dev/null &DISPLAY=:0 - - export DISPLAY - - sudo -E PATH=$PATH ./ui-tests/runTestsTesting.sh + - xvfb-run --server-args="-screen 0 1440x900x24" make test + - sleep 5 + - ./ui-tests/runTestsTesting.sh - name: "Front End" stage: "Frontend" From 0196cc4a2e5d31d28da8a87aed1aa7dbb15f9f1d Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Fri, 14 Dec 2018 15:50:01 -0800 Subject: [PATCH 109/226] tweaked how xvfb is used --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f0ed12d4..9d648bd38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -444,9 +444,7 @@ matrix: - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" make test - - sleep 5 - - ./ui-tests/runTestsTesting.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh - name: "Front End" stage: "Frontend" From eafc3f01e4fe94612d4b9d9b24e53212f1532c63 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 14 Dec 2018 16:52:10 -0800 Subject: [PATCH 110/226] testing testsuite seemed to work so switching back to cucumber test suite --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d648bd38..bda646eeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -444,7 +444,7 @@ matrix: - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh - name: "Front End" stage: "Frontend" From 518a71355902f4bd0f6dec75893011651b10b00d Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 09:24:10 -0800 Subject: [PATCH 111/226] remove change directory command to test effect on the class path errors we've been seeing --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bda646eeb..6aab12b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -442,9 +442,10 @@ matrix: - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - - cd /home/travis/build/bcgov/OCWA/ + #- cd /home/travis/build/bcgov/OCWA/ #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + #- xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - name: "Front End" stage: "Frontend" From 0cc9d4fc415ae62b049c4ecde9f292115389dc17 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 09:58:12 -0800 Subject: [PATCH 112/226] adding to the classpath to resolve missing class errors --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6aab12b60..9716edb38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -442,10 +442,11 @@ matrix: - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - #- cd /home/travis/build/bcgov/OCWA/ + - cd /home/travis/build/bcgov/OCWA/ + - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - #- xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh - - xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - name: "Front End" stage: "Frontend" From 1feef572a7ebc88d1b50a3ffab44d8b2c086515c Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 17 Dec 2018 10:25:52 -0800 Subject: [PATCH 113/226] katalon needs openjdk 8 so install it --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9716edb38..d0c3dce48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -433,7 +433,10 @@ matrix: - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & - + + #Katalon requires OpenJDK 8 installed seperately + - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk + #Install Katalon Studios - cd /home/travis/build/bcgov/OCWA/ui-tests - chmod ugo+x runTests.sh From 895fc7b8f018e9920402db1c54ca719dda1cbb8d Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 11:01:23 -0800 Subject: [PATCH 114/226] try an expanded non-cucumber test --- .travis.yml | 2 +- .../Requester/test_case_testing/Script1544808549240.groovy | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0c3dce48..e166d9ab3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -448,7 +448,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - name: "Front End" diff --git a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy index 20c39440a..97fc4c379 100644 --- a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy +++ b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy @@ -13,9 +13,11 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -WebUI.openBrowser('') +WebUI.openBrowser('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') -WebUI.delay(5) +WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + +WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) WebUI.closeBrowser() From 6e8ab41a456231e13ea479674a35427e83f6396c Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 11:29:27 -0800 Subject: [PATCH 115/226] fix testing url bug; leaner travis build for testing integration --- .travis.yml | 391 +----------------- .../Script1544808549240.groovy | 2 +- 2 files changed, 2 insertions(+), 391 deletions(-) diff --git a/.travis.yml b/.travis.yml index e166d9ab3..7bef02448 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,354 +13,6 @@ addons: matrix: include: - - name: "Forum Api" - stage: "APIs" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - before_script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - helm lint helm/forum-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Request Api" - stage: "APIs" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - npm install - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - helm lint helm/request-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Policy Api" - stage: "APIs" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - helm lint helm/policy-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Validation Api" - stage: "APIs" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - helm lint helm/validate-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Scan - Python" - stage: "Tests" - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1 -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - - - name: "Scan - NodeJS" - stage: "Tests" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - - cd /home/travis/build/bcgov/OCWA/frontend - - npm test - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - - name: "OCWA Master Helm Chart" - stage: "Tests" - language: node_js - node_js: - - "node" - cache: npm - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa - name: "Integration Tests" stage: "Tests" @@ -451,48 +103,7 @@ matrix: - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - - name: "Front End" - stage: "Frontend" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - + env: global: - HELM_URL=https://storage.googleapis.com/kubernetes-helm diff --git a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy index 97fc4c379..33d71f778 100644 --- a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy +++ b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy @@ -15,7 +15,7 @@ import internal.GlobalVariable as GlobalVariable WebUI.openBrowser('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') -WebUI.navigateToUrl(GlobalVariable.OCWA_URL) +//WebUI.navigateToUrl(GlobalVariable.OCWA_URL) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) From 1a711432943caaea7d2bb337ebb747ffe6aba8f0 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 14:42:12 -0800 Subject: [PATCH 116/226] a minimal cucumber test --- .travis.yml | 2 +- .../groovy/Requester_step_def_ks.groovy | 80 +++++++++++++++---- 2 files changed, 64 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7bef02448..45733c8ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTestsTesting.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 70de81198..210e76e4d 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -62,27 +62,25 @@ class Requester_step_def_ks { WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) - WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + //WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + //WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } @Given("requester has started a request") def requester_starts_new_request() { - newRequestButtonObject = new TestObject("new-request-button") - newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + //newRequestButtonObject = new TestObject("new-request-button") + //newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - WebUI.waitForPageLoad(30) + //WebUI.waitForPageLoad(30) - WebUI.waitForElementClickable(newRequestButtonObject, 30) - //WebUI.sendKeys(Keys.Return) - WebUI.click(newRequestButtonObject) - - request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + //WebUI.waitForElementClickable(newRequestButtonObject, 30) + //WebUI.click(newRequestButtonObject) + //request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + //WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) } @Given("has not submitted the request") @@ -91,18 +89,66 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { + // selenium.click("id=request-form-save-files-button") + // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") + } + + @Given("the output files do not violate any blocking rules") + def output_files_do_not_violate_blocking_rules(){} + + @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") + def requester_affirms_output_is_safe() { + } + + @Given("requester has a submitted request") + def request_has_submitted_a_request(){ + requester_starts_new_request() + requester_adds_output_files() + requester_submits_request() } + @Given("the request has been claimed by an output checker") + def request_has_been_claimed_by_a_oc(){} + @When("the requester saves their request") def requester_saves_new_request() { - requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - WebUI.click(requestFormSaveCloseButtonObject) + //requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + //requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + //WebUI.click(requestFormSaveCloseButtonObject) + } + + @When("requester submits their request") + def requester_submits_request() { + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + } + + @When("requester writes and submits a new comment") + def requester_creates_a_new_comment(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Smcuk')) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + + //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) + + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') } @Then("the requester should be able to re-open the request and pick up where they left off") def confirm_draft_save_was_successful() { - WebUI.waitForPageLoad(0) - WebUI.verifyTextPresent(request_name, false) + //WebUI.waitForPageLoad(0) + //WebUI.verifyTextPresent(request_name, false) + } + + @Then("the requester's request is put in awaiting review") + def confirm_request_is_in_awaiting_review_state(){ + WebUI.verifyTextPresent("Awaiting review", false) + } + + @Then("the requester should not be able to submit the request") + def requester_is_not_able_to_submit_request(){ + WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) } } \ No newline at end of file From 201c688bc6c720ba7267ab0633afbf5204268001 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 14:57:43 -0800 Subject: [PATCH 117/226] explicitly provide the failure handling approach --- .../Script1544053608217.groovy | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy index f28816a4c..8c695da22 100644 --- a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy +++ b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy @@ -13,4 +13,22 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +//import org.junit.runner.RunWith +//import cucumber.api.CucumberOptions +//import cucumber.api.junit.Cucumber +//import com.kms.katalon.core.cucumber.keyword.CucumberRunnerResult + +//@RunWith(Cucumber.class) +//@CucumberOptions(features = "Include/features/requester", glue = "") +//public class MyCucumberRunner {} + +//cucumberRunnerClass c = new MyCucumberRunner() + +//CucumberRunnerResult c1 = CucumberKW.runWithCucumberRunner(MyCucumberRunner.class) + + +//CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature', FailureHandling.STOP_ON_FAILURE) +//CucumberRunnerResult c1 = CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +//CucumberKW.runFeatureFolder('Include/features/requester') +//println "Status" + c1.getStatus().toString() \ No newline at end of file From 69180ec0cbdd9b8b34260d051c72fbd6a4a8a852 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 15:58:31 -0800 Subject: [PATCH 118/226] simpliest cucumber test possible --- .../Include/scripts/groovy/Requester_step_def_ks.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 210e76e4d..5f5053221 100644 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -57,10 +57,12 @@ class Requester_step_def_ks { @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') + WebUI.delay(5) + WebUI.closeBrowser() - WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') From b84ba73c4a7a97e85e01b9a9a090909c635891ec Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 17 Dec 2018 16:15:28 -0800 Subject: [PATCH 119/226] try using Cucumber Runner class instead of the runFeature call --- .../scripts/groovy/MyCucumberRunner.groovy | 26 +++++++++++++++++++ .../Script1544053608217.groovy | 14 +++------- 2 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy diff --git a/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy b/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy new file mode 100644 index 000000000..4ae4db5f1 --- /dev/null +++ b/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy @@ -0,0 +1,26 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.annotation.Keyword +import com.kms.katalon.core.checkpoint.Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.testcase.TestCase +import com.kms.katalon.core.testdata.TestData +import com.kms.katalon.core.testobject.TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI + +import internal.GlobalVariable + +import org.junit.runner.RunWith +import cucumber.api.CucumberOptions +import cucumber.api.junit.Cucumber +import com.kms.katalon.core.cucumber.keyword.CucumberRunnerResult + +@RunWith(Cucumber.class) +@CucumberOptions(features = "Include/features/requester/draft_requests.feature", glue = "") +public class MyCucumberRunner {} \ No newline at end of file diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy index 8c695da22..9abd4b88e 100644 --- a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy +++ b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy @@ -13,22 +13,16 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -//import org.junit.runner.RunWith -//import cucumber.api.CucumberOptions -//import cucumber.api.junit.Cucumber -//import com.kms.katalon.core.cucumber.keyword.CucumberRunnerResult - -//@RunWith(Cucumber.class) -//@CucumberOptions(features = "Include/features/requester", glue = "") -//public class MyCucumberRunner {} + //cucumberRunnerClass c = new MyCucumberRunner() -//CucumberRunnerResult c1 = CucumberKW.runWithCucumberRunner(MyCucumberRunner.class) +//CucumberRunnerResult c1 = +CucumberKW.runWithCucumberRunner(MyCucumberRunner.class) //CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') -CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature', FailureHandling.STOP_ON_FAILURE) +//CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature', FailureHandling.STOP_ON_FAILURE) //CucumberRunnerResult c1 = CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') //CucumberKW.runFeatureFolder('Include/features/requester') //println "Status" + c1.getStatus().toString() \ No newline at end of file From c36d83b919ac3e27b3bafb1e15b84859d44bfca9 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 14:57:09 -0800 Subject: [PATCH 120/226] re-creating Katalon project in separate directory --- .travis.yml | 2 +- ui_tests/.gitignore | 8 + ui_tests/.project | 74 +++++++++ ui_tests/Include/config/log.properties | 6 + ...discussion_status_approved_request.feature | 7 + .../manual_output_checking_component.feature | 19 +++ .../team_sharing_component.feature | 22 +++ .../output_checker/adjudicate request.feature | 17 ++ .../output_checker/claim_request.feature | 14 ++ .../output_checker/undo_approval.feature | 9 + ...tered_requests_for_output_checkers.feature | 12 ++ ..._approved_output_files_outside_SRE.feature | 7 + .../requester/canceling_request.feature | 7 + .../requester/create_a_new_request.feature | 39 +++++ .../features/requester/draft_requests.feature | 16 ++ .../edit_previously_submitted_request.feature | 8 + .../features/requester/notifications.feature | 23 +++ .../requester/request_discussion.feature | 15 ++ ...edit_project_team_members_requests.feature | 15 ++ .../requester/see_requests_by_status.feature | 18 ++ .../requester/view_request_details.feature | 7 + .../groovy/Requester_step_def_ks.groovy | 156 ++++++++++++++++++ ui_tests/Libs/CustomKeywords.groovy | 5 + ui_tests/Libs/internal/GlobalVariable.groovy | 33 ++++ ui_tests/OCWA.prj | 28 ++++ ui_tests/Profiles/Travis.glbl | 12 ++ .../Script1545256102660.groovy | 17 ++ ui_tests/Test Cases/RunCucumberTests.tc | 8 + ui_tests/Test Suites/CucumberSuite.groovy | 66 ++++++++ ui_tests/Test Suites/CucumberSuite.ts | 20 +++ ui_tests/console.properties | 7 + ui_tests/runTests.sh | 3 + ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 0 ...com.kms.katalon.execution.webui.properties | 2 + ...s.katalon.integration.analytics.properties | 0 ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 38 files changed, 701 insertions(+), 1 deletion(-) create mode 100644 ui_tests/.gitignore create mode 100644 ui_tests/.project create mode 100644 ui_tests/Include/config/log.properties create mode 100644 ui_tests/Include/features/administator/export_discussion_status_approved_request.feature create mode 100644 ui_tests/Include/features/administator/manual_output_checking_component.feature create mode 100644 ui_tests/Include/features/administator/team_sharing_component.feature create mode 100644 ui_tests/Include/features/output_checker/adjudicate request.feature create mode 100644 ui_tests/Include/features/output_checker/claim_request.feature create mode 100644 ui_tests/Include/features/output_checker/undo_approval.feature create mode 100644 ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature create mode 100644 ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature create mode 100644 ui_tests/Include/features/requester/canceling_request.feature create mode 100644 ui_tests/Include/features/requester/create_a_new_request.feature create mode 100644 ui_tests/Include/features/requester/draft_requests.feature create mode 100644 ui_tests/Include/features/requester/edit_previously_submitted_request.feature create mode 100644 ui_tests/Include/features/requester/notifications.feature create mode 100644 ui_tests/Include/features/requester/request_discussion.feature create mode 100644 ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature create mode 100644 ui_tests/Include/features/requester/see_requests_by_status.feature create mode 100644 ui_tests/Include/features/requester/view_request_details.feature create mode 100644 ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy create mode 100644 ui_tests/Libs/CustomKeywords.groovy create mode 100644 ui_tests/Libs/internal/GlobalVariable.groovy create mode 100644 ui_tests/OCWA.prj create mode 100644 ui_tests/Profiles/Travis.glbl create mode 100644 ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy create mode 100644 ui_tests/Test Cases/RunCucumberTests.tc create mode 100644 ui_tests/Test Suites/CucumberSuite.groovy create mode 100644 ui_tests/Test Suites/CucumberSuite.ts create mode 100644 ui_tests/console.properties create mode 100644 ui_tests/runTests.sh create mode 100644 ui_tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.execution.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.execution.webui.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.integration.jira.properties create mode 100644 ui_tests/settings/internal/com.kms.katalon.integration.qtest.properties diff --git a/.travis.yml b/.travis.yml index 45733c8ab..7653b9162 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui-tests/runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh diff --git a/ui_tests/.gitignore b/ui_tests/.gitignore new file mode 100644 index 000000000..0b12e47b0 --- /dev/null +++ b/ui_tests/.gitignore @@ -0,0 +1,8 @@ +# Katalon Studio +Reports/* +ReportFolder/* +Profiles/default.glbl +.classpath +.settings +/bin/ +Libs/TempTest*.groovy diff --git a/ui_tests/.project b/ui_tests/.project new file mode 100644 index 000000000..a3c48d6bb --- /dev/null +++ b/ui_tests/.project @@ -0,0 +1,74 @@ + + + OCWA.prj + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + + + 0 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 0 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 0 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 0 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545259433429 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545259433448 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + diff --git a/ui_tests/Include/config/log.properties b/ui_tests/Include/config/log.properties new file mode 100644 index 000000000..8142b1dc2 --- /dev/null +++ b/ui_tests/Include/config/log.properties @@ -0,0 +1,6 @@ +# This file is used to configure Katalon Studio execution log levels. + +# When you need to troubleshoot Katalon Studio issue +# logging.level.com.kms=TRACE + +# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature b/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature new file mode 100644 index 000000000..263130bd7 --- /dev/null +++ b/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature @@ -0,0 +1,7 @@ +Feature: export discussion and status log of a request +As an administrator I need the ability to export a discussion / status log to a pdf file upon request approval so that I have a file-based log of the conversation independent of the database + + Scenario: generate an export log of a newly approved request + Given a request has a status of "Review in Progress" + When an output checker approves the request + Then a pdf file should be generates that chronologically lists the discussion about the request as well as status changes \ No newline at end of file diff --git a/ui_tests/Include/features/administator/manual_output_checking_component.feature b/ui_tests/Include/features/administator/manual_output_checking_component.feature new file mode 100644 index 000000000..62c5aa0c6 --- /dev/null +++ b/ui_tests/Include/features/administator/manual_output_checking_component.feature @@ -0,0 +1,19 @@ +Feature: Enable / Disable manual output checker component +As an administrator I need the ability to disable the manual output checker components so that stakeholders that do not have a manual output checking step in their export process can still utilize the application + + Scenario: Manual output checking component turned off and passes all policy tests + Given the manual output checking component has been marked as disabled + And the request passes all policy tests + When a request is submitted + Then the request status should be "Approved" + + Scenario: Manual output checking component turned off and fails a policy test + Given the manual output checking component has been marked as disabled + And the request fails at least one policy test + When a request is submitted + Then the request status should be "Work in progress" + + Scenario: Manual output checking component is turned on + Given the manual output checking component has been marked as enabled + When a request is submitted + Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui_tests/Include/features/administator/team_sharing_component.feature b/ui_tests/Include/features/administator/team_sharing_component.feature new file mode 100644 index 000000000..328d41da8 --- /dev/null +++ b/ui_tests/Include/features/administator/team_sharing_component.feature @@ -0,0 +1,22 @@ +Feature: team sharing of requests +As an administrator I need the ability to enable / disable the ability for requesters to view / edit their team member's request on a per project basis so that multiple types of project sharing models can be accommodated + + Scenario outline: Team sharing enabled + Given team sharing has been marked as enabled + And requester A is logged in + And requester B on the same project exists + And requester B has a request + When requester A views team's requests + Then requester B's request status should be visible + Example: + | status | + | Draft | + | Awaiting review | + | Review in progress | + | Approved | + | Work in progress | + | Archived | + Scenario: Team sharing disabled + Given team sharing has been marked as disabled + When a request is submitted + Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/adjudicate request.feature b/ui_tests/Include/features/output_checker/adjudicate request.feature new file mode 100644 index 000000000..aa0da9e64 --- /dev/null +++ b/ui_tests/Include/features/output_checker/adjudicate request.feature @@ -0,0 +1,17 @@ +Feature: Adjudicate request +As an output checker I need the ability to change the status of a request to "Revisions required" so that I can allow the requester to tweak their request without having deny the request and forcing the requester to create a new request +As an output checker I need the ability to change the status of a request to "Approved" so that I can allow the requester to take their outputs out of the SRE + + Scenario: Request is worthy of approval + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as approved + Then the output checker should see the status of the request updated to "Approved" + And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request + + Scenario: Request is needs revisions + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as needs revisions + Then the output checker should see the status of the request updated to "Work in progress" + And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/claim_request.feature b/ui_tests/Include/features/output_checker/claim_request.feature new file mode 100644 index 000000000..371010dd3 --- /dev/null +++ b/ui_tests/Include/features/output_checker/claim_request.feature @@ -0,0 +1,14 @@ +Feature: Claim a request +As an output checker I need the ability to claim a request so that I can let my fellow output checker know that I'm going to be working on a particular request + +Scenario: Claim an unclaimed request +Given output checker has logged in +When output checker tries to claim an unclaimed request +Then the output checker should be able to see that they're now assigned the request + +Scenario: Claim a request already claimed by another output checker +Given output checker has logged in + And at least on other output checker exists + And the other output checker is assigned to a request +When output checker tries to claim the already assigned request +Then the output checker should be able to see that they're now assigned the request \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/undo_approval.feature b/ui_tests/Include/features/output_checker/undo_approval.feature new file mode 100644 index 000000000..d82687a8f --- /dev/null +++ b/ui_tests/Include/features/output_checker/undo_approval.feature @@ -0,0 +1,9 @@ +Feature: Undo request approval +As an output checker I need the ability to undo a request approval so that I can appropriately update requests to fix requests that were accidently approved or need to be made unavailable to an requester + +Scenario: Undo an approved request +Given output checker has logged in + And at least one approved request exists +When output checker submits an approved request to undo +Then the output checker should see that the request is now has a status of "Work in progress" +And the status of "Accepted" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature b/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature new file mode 100644 index 000000000..0300a9ed3 --- /dev/null +++ b/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature @@ -0,0 +1,12 @@ +Feature: See a list of all output checking requests +As an output checker I need the ability to see all requests so that I can quickly see what is in the queue + +Scenario Outline: View requests + Given output checker has logged in + When output checker selects a filter + Then the output checker should only see requests of type + Examples: + | filter | filter_condition | + | My requests | requests claimed by the output checker | + | Unassigned | requests not claimed by an output checker | + | All | all requests | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature b/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature new file mode 100644 index 000000000..f4951feff --- /dev/null +++ b/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature @@ -0,0 +1,7 @@ +Feature: Access approved output files outside of the secure environment +As an requester I want to be able to access approved output files outside of the secure environment so that I can share my results with others + Scenario: Access approved request outside of the SRE + Given requester has logged in (outside of SRE) + And requester has an approved request + When requester views their request's approved files + Then requester can copy their approved files to their local computer \ No newline at end of file diff --git a/ui_tests/Include/features/requester/canceling_request.feature b/ui_tests/Include/features/requester/canceling_request.feature new file mode 100644 index 000000000..a54c7dbbb --- /dev/null +++ b/ui_tests/Include/features/requester/canceling_request.feature @@ -0,0 +1,7 @@ +Feature: Canceling a request +As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed + Scenario: Cancel a request + Given requester has logged in + And requester has a request that is "Awaiting review" or "Review in progress" + When the requester cancels the request + Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui_tests/Include/features/requester/create_a_new_request.feature b/ui_tests/Include/features/requester/create_a_new_request.feature new file mode 100644 index 000000000..3b4fdc527 --- /dev/null +++ b/ui_tests/Include/features/requester/create_a_new_request.feature @@ -0,0 +1,39 @@ +Feature: create a new request + As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment + Background: + Given requester has logged in + And requester has started a request + And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge + Scenario: A valid request + Given the output files do not violate any blocking rules + When requester submits their request + Then the requester's request is put in awaiting review + Scenario: A request has no data + Given requester does not provide any data they wish to export + When requester submits their request + Then the requester should not be able to submit the request + + Scenario Outline: A request violates blocking rule + Given a request violates blocking rule: + When requester submits their request + Then requester should not be able to submit the request + And the requester should be informed that has been violated + + Examples: + | blocking_rule | + | A request that has a file that is too big | + | The summation of all export file sizes exceeds the request file size limit | + | An export file has a blocked file extension | + | A request has a file with a StudyID in it | + + Scenario Outline: A request violates warning rule + Given a request violates blocking rule: + When requester submits their request + Then requester should be able to submit the request + And the requester should be informed that has been violated + + Examples: + | warning_rule | + | A request that has a file that exceeds the file size warning threshold | + | The summation of all export file sizes exceeds the request file size warning threshold | + | An export file has a warning file extension | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature new file mode 100644 index 000000000..cbe142827 --- /dev/null +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -0,0 +1,16 @@ +Feature: Draft requests +As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once + Background: + Given requester has logged in + Scenario: Save a draft request (no files) + And requester has started a request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off + + Scenario: Save a draft request (with files) + And requester has started a request + And requester add output files to the request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off \ No newline at end of file diff --git a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature new file mode 100644 index 000000000..05dcde51b --- /dev/null +++ b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature @@ -0,0 +1,8 @@ +Feature: edit a previously submitted request +As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request + Scenario: Edit a request that has been reviewed by an output checker and needs revisions + Given requester has logged in + And requester the request is "Work in Progress" + When the requester views the request + Then the requester should be able to make changes to the request + And re-submit the request \ No newline at end of file diff --git a/ui_tests/Include/features/requester/notifications.feature b/ui_tests/Include/features/requester/notifications.feature new file mode 100644 index 000000000..e0c0df1fd --- /dev/null +++ b/ui_tests/Include/features/requester/notifications.feature @@ -0,0 +1,23 @@ +Feature: Notifications +As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action + + Scenario Outline: requester notifications + Given requester has a submitted request + When occurs + Then the requester should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | output checker makes a comment on the request | + | output checker approves the request | + | output checker requests revisions the request | + + Scenario Outline: output checker notifications + Given an output checker has currently claimed a request + When occurs + Then the output checker should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | requester makes a comment on the request | + | requester re-submits a request | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/request_discussion.feature b/ui_tests/Include/features/requester/request_discussion.feature new file mode 100644 index 000000000..f6aff55b7 --- /dev/null +++ b/ui_tests/Include/features/requester/request_discussion.feature @@ -0,0 +1,15 @@ +Feature: Discussion about a request + As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request + As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request + Scenario: requester adds a new comment about request + Given requester has logged in + And requester has a submitted request + And the request has been claimed by an output checker + When requester writes and submits a new comment + Then the requester should see their new comment displayed + And the output checker assigned to the request should be notified of the new comment + Scenario: Output checker adds a new comment about request + Given output checker has logged in + When output checker writes and submits a new comment + Then the output checker should see their new comment displayed + And the requester(s) associated to the request should be notified of the new comment \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature b/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature new file mode 100644 index 000000000..7e42638e3 --- /dev/null +++ b/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature @@ -0,0 +1,15 @@ +Feature: seeing / editing project team members requests +As an requester I need the ability to see / edit my team member's requests so that I can more easily collaborate with my fellow team members + Background: + Given requester has logged in + And the requester is a member of a project team + And another project team member has created a request + And the project has team sharing enabled + Scenario: View / edit a team member's request in a project that allows editing of team member's requests + Given the requester's project allows for editing of team member's requests + When the requester views their requests + Then the team member's request should be visible and editable + Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests + Given the requester's project does not allow for editing of team member's requests + When the requester views their requests + Then the team member's request should not be visible or editable \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_requests_by_status.feature b/ui_tests/Include/features/requester/see_requests_by_status.feature new file mode 100644 index 000000000..14c8c5bc5 --- /dev/null +++ b/ui_tests/Include/features/requester/see_requests_by_status.feature @@ -0,0 +1,18 @@ +Feature: See requester's requests by status +As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review + Scenario Outline: View requests + Given requester has logged in + And the requester has an request + And request was last updated within the last month + When requester views requests + Then requests should be displayed + But requests with updates older than a month should not be displayed + + Examples: + | status | filter | + | Approved | Approved | + | Revisions required | Draft | + | Awaiting review | Submitted | + | Review in progress | Submitted | + | Draft | Draft | + | Work in progress | Draft | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/view_request_details.feature b/ui_tests/Include/features/requester/view_request_details.feature new file mode 100644 index 000000000..d7ad2b06b --- /dev/null +++ b/ui_tests/Include/features/requester/view_request_details.feature @@ -0,0 +1,7 @@ +Feature: View request details +As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions + Scenario: View details of a request + Given requester has logged in + And the requester has submitted a request + When the requester views the request + Then the requester should see the complete record of the request (including export files, supporting files/text, discussion, and status changes) \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy new file mode 100644 index 000000000..5f5053221 --- /dev/null +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -0,0 +1,156 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.annotation.Keyword +import com.kms.katalon.core.checkpoint.Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords +import com.kms.katalon.core.model.FailureHandling +import com.kms.katalon.core.testcase.TestCase +import com.kms.katalon.core.testcase.TestCaseFactory +import com.kms.katalon.core.testdata.TestData +import com.kms.katalon.core.testdata.TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository +import com.kms.katalon.core.testobject.TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords + +import internal.GlobalVariable + +import MobileBuiltInKeywords as Mobile +import WSBuiltInKeywords as WS +import WebUiBuiltInKeywords as WebUI + +import org.openqa.selenium.WebElement +import org.openqa.selenium.WebDriver +import org.openqa.selenium.By + +import com.kms.katalon.core.mobile.keyword.internal.MobileDriverFactory +import com.kms.katalon.core.webui.driver.DriverFactory + +import com.kms.katalon.core.testobject.RequestObject +import com.kms.katalon.core.testobject.ResponseObject +import com.kms.katalon.core.testobject.ConditionType +import com.kms.katalon.core.testobject.TestObjectProperty + +import com.kms.katalon.core.mobile.helper.MobileElementCommonHelper +import com.kms.katalon.core.util.KeywordUtil + +import com.kms.katalon.core.webui.exception.WebElementNotFoundException + +import cucumber.api.java.en.And +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When + + +class Requester_step_def_ks { + String request_name = '' + TestObject newRequestButtonObject = null + TestObject requestFormSaveCloseButtonObject = null + + /** + * The step definitions below match with Katalon sample Gherkin steps + */ + @Given("requester has logged in") + def requester_login() { + WebUI.openBrowser('') + WebUI.delay(5) + WebUI.closeBrowser() + + //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) + + //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + + //WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + + //WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + } + + @Given("requester has started a request") + def requester_starts_new_request() { + + //newRequestButtonObject = new TestObject("new-request-button") + //newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + + //WebUI.waitForPageLoad(30) + + //WebUI.waitForElementClickable(newRequestButtonObject, 30) + //WebUI.click(newRequestButtonObject) + //request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + //WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + } + + @Given("has not submitted the request") + def requester_has_not_submitted_new_request() { + } + + @Given("requester add output files to the request") + def requester_adds_output_files() { + // selenium.click("id=request-form-save-files-button") + // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") + } + + @Given("the output files do not violate any blocking rules") + def output_files_do_not_violate_blocking_rules(){} + + @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") + def requester_affirms_output_is_safe() { + } + + @Given("requester has a submitted request") + def request_has_submitted_a_request(){ + requester_starts_new_request() + requester_adds_output_files() + requester_submits_request() + } + + @Given("the request has been claimed by an output checker") + def request_has_been_claimed_by_a_oc(){} + + @When("the requester saves their request") + def requester_saves_new_request() { + //requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + //requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + //WebUI.click(requestFormSaveCloseButtonObject) + } + + @When("requester submits their request") + def requester_submits_request() { + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + } + + @When("requester writes and submits a new comment") + def requester_creates_a_new_comment(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Smcuk')) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + + //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) + + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') + } + + @Then("the requester should be able to re-open the request and pick up where they left off") + def confirm_draft_save_was_successful() { + //WebUI.waitForPageLoad(0) + //WebUI.verifyTextPresent(request_name, false) + } + + @Then("the requester's request is put in awaiting review") + def confirm_request_is_in_awaiting_review_state(){ + WebUI.verifyTextPresent("Awaiting review", false) + } + + @Then("the requester should not be able to submit the request") + def requester_is_not_able_to_submit_request(){ + WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + } +} \ No newline at end of file diff --git a/ui_tests/Libs/CustomKeywords.groovy b/ui_tests/Libs/CustomKeywords.groovy new file mode 100644 index 000000000..c595a4f8a --- /dev/null +++ b/ui_tests/Libs/CustomKeywords.groovy @@ -0,0 +1,5 @@ + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ + diff --git a/ui_tests/Libs/internal/GlobalVariable.groovy b/ui_tests/Libs/internal/GlobalVariable.groovy new file mode 100644 index 000000000..073fd2170 --- /dev/null +++ b/ui_tests/Libs/internal/GlobalVariable.groovy @@ -0,0 +1,33 @@ +package internal + +import com.kms.katalon.core.configuration.RunConfiguration +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ +public class GlobalVariable { + + /** + *

+ */ + public static Object OCWA_URL + + + static { + def allVariables = [:] + allVariables.put('default', [:]) + allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) + + String profileName = RunConfiguration.getExecutionProfile() + + def selectedVariables = allVariables[profileName] + OCWA_URL = selectedVariables['OCWA_URL'] + + } +} diff --git a/ui_tests/OCWA.prj b/ui_tests/OCWA.prj new file mode 100644 index 000000000..b6f147e8e --- /dev/null +++ b/ui_tests/OCWA.prj @@ -0,0 +1,28 @@ + + + Katalon with Cucumber support + OCWA + + 3d119e91-3135-4c99-aab6-6022650ddbe1 + 5.9.0 + 0 + + + + Include/scripts/groovy + + + + + Include/scripts/groovy + + + Include/features + + + Include/config + + + + GENERIC + diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl new file mode 100644 index 000000000..feb3f8808 --- /dev/null +++ b/ui_tests/Profiles/Travis.glbl @@ -0,0 +1,12 @@ + + + + Travis + + false + + + 'http://localhost:8000' + OCWA_URL + + diff --git a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy new file mode 100644 index 000000000..3b1c2856f --- /dev/null +++ b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy @@ -0,0 +1,17 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') + diff --git a/ui_tests/Test Cases/RunCucumberTests.tc b/ui_tests/Test Cases/RunCucumberTests.tc new file mode 100644 index 000000000..de22fa419 --- /dev/null +++ b/ui_tests/Test Cases/RunCucumberTests.tc @@ -0,0 +1,8 @@ + + + + RunCucumberTests + + + 9ff0f7de-66e4-496b-8b61-802a9ed960fd + diff --git a/ui_tests/Test Suites/CucumberSuite.groovy b/ui_tests/Test Suites/CucumberSuite.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/ui_tests/Test Suites/CucumberSuite.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts new file mode 100644 index 000000000..d2f5f6ad0 --- /dev/null +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -0,0 +1,20 @@ + + + + CucumberSuite + + false + 2018-12-19T14:46:16 + + 0 + 30 + true + false + 4efd54cc-68dc-4a64-a8f1-7ae0c49473f5 + + f69ad29e-d701-467b-8299-76addc057f6a + false + true + Test Cases/RunCucumberTests + + diff --git a/ui_tests/console.properties b/ui_tests/console.properties new file mode 100644 index 000000000..417380976 --- /dev/null +++ b/ui_tests/console.properties @@ -0,0 +1,7 @@ +#Sat Sep 08 18:41:21 NZST 2018 +deviceId= +kobitonDeviceId= +qTestDestId= +qTestDestType= +remoteWebDriverType=Selenium +remoteWebDriverUrl= diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh new file mode 100644 index 000000000..62ac165cd --- /dev/null +++ b/ui_tests/runTests.sh @@ -0,0 +1,3 @@ +echo "Starting tests" + +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuites" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui_tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/ui_tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/settings/internal/com.kms.katalon.execution.properties b/ui_tests/settings/internal/com.kms.katalon.execution.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties new file mode 100644 index 000000000..c09ce9715 --- /dev/null +++ b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties @@ -0,0 +1,2 @@ +#Sat Sep 08 18:41:20 NZST 2018 +execution.default.selectingCapturedObjectSelectorMethod="XPATH" diff --git a/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/settings/internal/com.kms.katalon.integration.jira.properties b/ui_tests/settings/internal/com.kms.katalon.integration.jira.properties new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/settings/internal/com.kms.katalon.integration.qtest.properties b/ui_tests/settings/internal/com.kms.katalon.integration.qtest.properties new file mode 100644 index 000000000..e69de29bb From 2fa10c6d36512bcf233244bdb174d21f016616ab Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 15:09:52 -0800 Subject: [PATCH 121/226] fixed path issue --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7653b9162..f00d2fc3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,15 +90,15 @@ matrix: - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui-tests + - cd /home/travis/build/bcgov/OCWA/ui_tests - chmod ugo+x runTests.sh - chmod ugo+x runTestsTesting.sh - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui_tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - cd /home/travis/build/bcgov/OCWA/ - - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui-tests/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui_tests/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From a4d0466691cc0abb7917b12881874f6a4bc4857c Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 15:23:49 -0800 Subject: [PATCH 122/226] fixed typo in shell file --- ui_tests/runTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh index 62ac165cd..79d2780ee 100644 --- a/ui_tests/runTests.sh +++ b/ui_tests/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuites" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From f77a5446d1515bfae2b6a877fd13db4642988f21 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 15:41:21 -0800 Subject: [PATCH 123/226] try installing Katalon a directory up --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f00d2fc3d..965bcbc29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,12 +93,13 @@ matrix: - cd /home/travis/build/bcgov/OCWA/ui_tests - chmod ugo+x runTests.sh - chmod ugo+x runTestsTesting.sh + #added line to install Katalon a directory up + - cd /home/travis/build/bcgov/OCWA - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/ui_tests/Katalon_Studio_Linux_64-${KATALON_VERSION} - - cd /home/travis/build/bcgov/OCWA/ - - export CLASSPATH=/home/travis/build/bcgov/OCWA/ui_tests/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export PATH=$PATH:/home/travis/build/bcgov/OCWA/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/OCWA/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From 89f5d75bd06d0f8c8fe991ee15226b76a871af61 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 16:13:48 -0800 Subject: [PATCH 124/226] add additional cucumber test suite --- ui_tests/Include/features/Login.feature | 32 ++++++ .../com/ea/steps/CucumberEARunner.groovy | 14 +++ .../groovy/com/ea/steps/LoginSteps.groovy | 103 ++++++++++++++++++ .../Script1536389635449.groovy | 18 +++ ui_tests/Test Cases/ExecuteAutomation_TC1.tc | 8 ++ ui_tests/Test Suites/TestSuite1.groovy | 66 +++++++++++ ui_tests/Test Suites/TestSuite1.ts | 20 ++++ ui_tests/runTests.sh | 2 +- 8 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 ui_tests/Include/features/Login.feature create mode 100644 ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy create mode 100644 ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy create mode 100644 ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy create mode 100644 ui_tests/Test Cases/ExecuteAutomation_TC1.tc create mode 100644 ui_tests/Test Suites/TestSuite1.groovy create mode 100644 ui_tests/Test Suites/TestSuite1.ts diff --git a/ui_tests/Include/features/Login.feature b/ui_tests/Include/features/Login.feature new file mode 100644 index 000000000..9a29cd767 --- /dev/null +++ b/ui_tests/Include/features/Login.feature @@ -0,0 +1,32 @@ +#Author: your.email@your.domain.com +#Keywords Summary : +#Feature: List of scenarios. +#Scenario: Business rule through list of steps with arguments. +#Given: Some precondition step +#When: Some key actions +#Then: To observe outcomes or validation +#And,But: To enumerate more Given,When,Then steps +#Scenario Outline: List of steps for data-driven as an Examples and +#Examples: Container for s table +#Background: List of steps run before each of the scenarios +#""" (Doc Strings) +#| (Data Tables) +#@ (Tags/Labels):To group Scenarios +#<> (placeholder) +#"" +## (Comments) +#Sample Feature Definition Template + + +@loginFeature +Feature: Login + Test the login functionality of the application + + @smoke + Scenario: Test the login functionality of EA application + Given I navigate to the login page + And I enter the following for Login + | username | password | + | admin | adminpassword | + And I click the login button + Then I should see the home page \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy new file mode 100644 index 000000000..bbd0ed1e9 --- /dev/null +++ b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy @@ -0,0 +1,14 @@ +package com.ea.steps + + +import org.junit.runner.RunWith; + +import cucumber.api.CucumberOptions; +import cucumber.api.junit.Cucumber; + + + +@RunWith(Cucumber.class) +@CucumberOptions(features="Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) +public class CucumberEARunner { +} diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy new file mode 100644 index 000000000..efe3bfe0d --- /dev/null +++ b/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy @@ -0,0 +1,103 @@ +package com.ea.steps +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI + +import cucumber.api.TypeRegistry; +import cucumber.api.TypeRegistryConfigurer; +import cucumber.api.java.en.And +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When +import io.cucumber.datatable.DataTableType; +import io.cucumber.datatable.TableEntryTransformer; + + +/* + * Author: Karthik KK + * Company: ExecuteAutomation + * Type: StepDefinition + * Step : LoginStep + */ +class LoginSteps { + @Given("I navigate to the login page") + def I_navigate_to_the_login_page() { + WebUI.openBrowser('') + WebUI.navigateToUrl('http://www.executeautomation.com/demosite/Login.html') + } + + + //Obsolete step + @When('I enter the username as "(.*) and password as "(.*)"') + def I_enter_username_password(String userName, String password) { + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), userName) + + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), password) + } + + @And("I enter the following for Login") + def I_enter_the_following_for_login(List table){ + // Way 1 - To get data from DataTable Type + // List> data = table.asMaps(String.class, String.class); + + // Way 2 - To get work with custom types using Lust + // //Create an ArrayList + // List users = new ArrayList(); + // //Store all the users + // users = table.asList(User.class); + + + //Iterate through the values + for (User user: table){ + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), user.username) + + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), user.password) + } + } + + + @Then("I click the login button") + def I_Click_login_button() { + WebUI.click(findTestObject('Object Repository/Page_Execute Automation/input_Login_Login')) + } + + @Then("I should see the home page") + def I_Should_see_the_home_page(){ + + //Assertions has been done ! + } +} + + +//Custom class responsible to get UserName and Password from table steps +class User { + public String username; + public String password; + + public User(String userName, String passWord) { + username= userName; + password = passWord; + } +} + + +//Custom Transformer to convert the custom User type +class Configurer implements TypeRegistryConfigurer { + + @Override + public void configureTypeRegistry(TypeRegistry registry) { + + registry.defineDataTableType(new DataTableType(User.class, new TableEntryTransformer() { + @Override + public User transform(Map entry) { + return new User(entry.get("username"),entry.get("password")); + } + })); + } + + @Override + public Locale locale() { + return Locale.ENGLISH; + } + +} diff --git a/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy b/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy new file mode 100644 index 000000000..f297771da --- /dev/null +++ b/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy @@ -0,0 +1,18 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.ea.steps.CucumberEARunner +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +CucumberKW.runWithCucumberRunner(CucumberEARunner.class) diff --git a/ui_tests/Test Cases/ExecuteAutomation_TC1.tc b/ui_tests/Test Cases/ExecuteAutomation_TC1.tc new file mode 100644 index 000000000..fce57605d --- /dev/null +++ b/ui_tests/Test Cases/ExecuteAutomation_TC1.tc @@ -0,0 +1,8 @@ + + + + ExecuteAutomation_TC1 + + + 9ccc1ff2-1a70-4f4b-ad95-dad93a1390b8 + diff --git a/ui_tests/Test Suites/TestSuite1.groovy b/ui_tests/Test Suites/TestSuite1.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/ui_tests/Test Suites/TestSuite1.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/ui_tests/Test Suites/TestSuite1.ts b/ui_tests/Test Suites/TestSuite1.ts new file mode 100644 index 000000000..a15c181f7 --- /dev/null +++ b/ui_tests/Test Suites/TestSuite1.ts @@ -0,0 +1,20 @@ + + + + TestSuite1 + + false + 2018-12-19T13:44:58 + + 0 + 30 + true + false + e8a1ffd6-0ef9-4ac4-9cad-c711a822a0a5 + + 2521c26f-59d1-446f-9fbe-59281ccceb99 + false + true + Test Cases/ExecuteAutomation_TC1 + + diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh index 79d2780ee..97a5b840f 100644 --- a/ui_tests/runTests.sh +++ b/ui_tests/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From 9b1850b7ca7275730bc76f209e65236e50e6066b Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 19 Dec 2018 16:50:34 -0800 Subject: [PATCH 125/226] revise cucumber runner path --- .../Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy index bbd0ed1e9..1e1f8b79e 100644 --- a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy +++ b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy @@ -9,6 +9,6 @@ import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features="Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) +@CucumberOptions(features="ui_tests/Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) public class CucumberEARunner { } From 8bf65dd4b487635d6b082112fd728230083b6b4c Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 09:56:29 -0800 Subject: [PATCH 126/226] move Katalon install location up a dir --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 965bcbc29..14b7f7f6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,13 +94,14 @@ matrix: - chmod ugo+x runTests.sh - chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up - - cd /home/travis/build/bcgov/OCWA + - cd /home/travis/build/bcgov - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/OCWA/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/OCWA/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} #RUN Integration Tests + - cd /home/travis/build/bcgov/OCWA - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From 1813b80a74b90b22bdf0a19de3a6de7628db71c5 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 10:30:40 -0800 Subject: [PATCH 127/226] classpath addition --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14b7f7f6a..26fe8e687 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,8 @@ matrix: - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins + - echo $CLASSPATH #RUN Integration Tests - cd /home/travis/build/bcgov/OCWA - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh From 49ad12af58fbaf1f08bc601143a354d805a81892 Mon Sep 17 00:00:00 2001 From: Paul Ripley Date: Thu, 20 Dec 2018 10:52:36 -0800 Subject: [PATCH 128/226] added git attribute file --- .gitattributes | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..b6cff8ec5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,14 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.c text +*.h text + +# Declare files that will always have CRLF line endings on checkout. +*.sln text eol=lf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary \ No newline at end of file From f2cca58a5ab84f9fd88f6c6bdda9b142d461eae2 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 10:55:02 -0800 Subject: [PATCH 129/226] update to Travis --- .travis.yml | 263 ++++++++++++++++++++++++++-------------------------- 1 file changed, 132 insertions(+), 131 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26fe8e687..d0d8e18c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,131 +1,132 @@ -dist: trusty -sudo: required -language: python - -services: -- docker - -addons: - sonarcloud: - organization: "ajc_bcgov" - token: - secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= - -matrix: - include: - - - name: "Integration Tests" - stage: "Tests" - language: node_js - node_js: - - "node" - addons: - chrome: stable - apt: - sources: - - ubuntu-toolchain-r-test - - python3-pip - packages: - - g++-4.8 - - python3-pip - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - - NODE_ENV=test npm start & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - - cd /home/travis/build/bcgov/OCWA/frontend - - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - #Katalon requires OpenJDK 8 installed seperately - - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk - - #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui_tests - - chmod ugo+x runTests.sh - - chmod ugo+x runTestsTesting.sh - #added line to install Katalon a directory up - - cd /home/travis/build/bcgov - - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins - - echo $CLASSPATH - #RUN Integration Tests - - cd /home/travis/build/bcgov/OCWA - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh - #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - - -env: - global: - - HELM_URL=https://storage.googleapis.com/kubernetes-helm - - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz - - TARGET_BR=gh-pages - - REPO_DIR=/home/travis/build/kubenow/helm-charts - - GH_URL=https://kubenow.github.io/helm-charts - - YAMLLINT_VERSION=1.8.1 - - CXX=g++-4.8 - - MONGODB=4.1.1 - - KATALON_VERSION=5.9.0 - - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - - SONAR_APP=sonar-scanner - - SONAR_VERSION=3.2.0.1227-linux - - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= - - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= - #SONAR_TOKEN - - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= - #QUAYIO_USERNAME - - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= - #QUAYIO_PASSWORD - - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= +dist: trusty +sudo: required +language: python + +services: +- docker + +addons: + sonarcloud: + organization: "ajc_bcgov" + token: + secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= + +matrix: + include: + + - name: "Integration Tests" + stage: "Tests" + language: node_js + node_js: + - "node" + addons: + chrome: stable + apt: + sources: + - ubuntu-toolchain-r-test + - python3-pip + packages: + - g++-4.8 + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + - cd /home/travis/build/bcgov/OCWA/frontend + + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + + #Katalon requires OpenJDK 8 installed seperately + - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk + + #Install Katalon Studios + - cd /home/travis/build/bcgov/OCWA/ui_tests + - chmod ugo+x runTests.sh + - chmod ugo+x runTestsTesting.sh + #added line to install Katalon a directory up + - cd /home/travis/build/bcgov + - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} + - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins + - echo $CLASSPATH + #RUN Integration Tests + - cd /home/travis/build/bcgov/OCWA + - cat ./ui_tests/console.properties + - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh + #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh + + +env: + global: + - HELM_URL=https://storage.googleapis.com/kubernetes-helm + - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz + - TARGET_BR=gh-pages + - REPO_DIR=/home/travis/build/kubenow/helm-charts + - GH_URL=https://kubenow.github.io/helm-charts + - YAMLLINT_VERSION=1.8.1 + - CXX=g++-4.8 + - MONGODB=4.1.1 + - KATALON_VERSION=5.9.0 + - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ + - SONAR_APP=sonar-scanner + - SONAR_VERSION=3.2.0.1227-linux + - secure: TsBkt0h9c9CQ+ZnA4CAVlWxCoTRV4Bn7Z0y8XvR99NlnfrUhSGWzi78wJ6W8oAqOawqDk5jnG3qIKXaaO1ZaiT8n3YFLhtAQzh+gy1B96GOJd6Yjmep7AxiWgW+g0Nm+V0vkGA/dwuUjothmnvLcsqK2+hmrknvTI+oe6xrNrOv4GAx9j3NJVfmhJmhBtnI+p8uqgqtn7aqrZZqW/jhwh10taRaIvvsMZ4FEZy8M9JI6cRfakQT656U9KGbXsC7XdnEf+G/N2qOq/MWucByBo98jCnuL5JvGzgZCSkywlShK8kPUuIREGfLv1RuSOOwlz95AA700Bf/SKGmqu58wAp8XOKWAtMTpf2o7WFXpb/Ghy6ysk5AGO6RSsFOTEh2EAdF42ExRy+N8mqDYdr9Vj+qWeVHXVR9vjtjbCLeHxl16sO0K/BzQ3gjCYLXQEC6mH3xfu6kDvQvdq20fKpXPeLvX+HI0ALokkL7RFaqjcEu8R+9zZAUIqCCTKs0Z3/CmrUd2H7MD7j30gFuR2RynSpGb8l476szAuLv1wk6L+gc4g+uG5pFPsBYaBp9mNJMHrOcBQfSFY9T4n/sY4z+2Bo7qC8g8JuLOtVsVcjZ0Ut0r0xASvEg87jlgdHy/NaAySmuZclheuqsqVqsKQOx38AgOSg9N0gX2i2jnq2ZkS+4= + - secure: pVjFIgT/w+sZPIP9g2sSP7OWlfnspGbQaCsQesDUniVcEIJGRTxURuA4RfeJeG8D6zAggsVRiAgcpb8/IU0gx32vdSOE7f10rnWYyf/YzpX9gEMsacEAi6QeCutZBSxz0dbUx2tVNP4qnAMBw/F+iG9msxVrJDIYr1M/+E1KHpknImN/ZaM4Yx34od+efpBudrb5rAtsUTUS8Jfdo4cnQBMFGO/nVb/VD3AATIZ4+tMeduVG0W2bORcuOR+iPXMiAHRFdaTLXR23oDnJZSPMWOAJC+hhHM6D1E5armU+utmfE58q5d64aeffgqcwZnVMHkhkJ6aNCnNojYJ/dKZOAKLklDO3IVd6k/TnRvVreZw68OlLj71b668ArknoIBvgwPZ0UOwPguVzNFGT+WBNlNW1uePmtO2sc5HO23fnK8P9HMqx09Q/HwWpEEOOvUpR4vpixPETRmZHA2lsccyr4lY5gExVqSHBslXHxz00So0x1lXDADU4f1Ma54h2P1++b3Dk0tjLlRCXeiiuV4i89C8Vz37ZplbYf1Aw60504o4LZC9rGJK5uf4OMm/IZF5DjnbH87MFtwKxKNnSL5KqCRGzksdt2R23rcRvAxp9o1YP4qC7POQ5ocr3By/ciNwzApFa2d7KfSDojjIgIU/oK9mKNk5tyQAeQb+CRylkeNk= + #SONAR_TOKEN + - secure: k0DUE5CZbZ/DLg1U8C6OBhAlmSzJtXdaC3tF4yf+Y8fLvHLdKkxxe48t53ZzapXL1yDLDu6exjI30SRau2PC09LizDzzOJOLquR/+BLyHEZo+2cHrQd8pIB3pTTqKbAQlxzzf/A3iipcvTqOgitVp+tYRahLINL0aUojc/BkyLPx3+sGD09zE4S++90e4DcraQxoB5JBIRJgzNf3nWgJyZV8wB15VQCCKA9jA2U7/FscU5gtpKDWb6gfml9LfIN/3M3ose/0dATt3AynADPqFWjHNkO3J6GzOmSqnP8OHeTgNcU7STpue2/VosB0gqT2bUDH6JK+GAeJBtsO+c2Z+v0KHLFQ7r1Uqo+fKpP5cq0j0+0czE4bXVjjqdz7mi/zex4PqWgVhVe/jW03stiOPGh34waFN7CzpA3dp3uwK1UN2uxdvAmp6OKfHoCo0FSrAJzKU6wJh980L7qpHYoyZOsyj8nJgRzGunHDWuiNRFb/aRI9DK3Ud1LrHJl0tsYs0YEu35MTGrtwbFfw04D+zifFsfZsyxnZsc9anpLSb6IrMOzH9PXSwTSajGDP2Q9rLylEPHxj5RDh5mPoBvmpv4wmSiM/K7M2k/lgFSOH34MX5bTkj4a+LtYsQngeMd1exlBxZySgaMyO9pAUQke0twMibYBac/z2s9s9jNJ7SKY= + #QUAYIO_USERNAME + - secure: e/Jtl6XJYUKfjM2oQXOkPj8FoavYULu59PgDG2h4hUyhtsMQOIHV8F9VBQ6mdmQE5pLPueUsscMvYGgrGEXk6DzjIeNad/Gadw4ImtPAH0iAMZlhFBDSJLRsjtVF0HaeJFNAyk8cU0PHvPOyegiw2tzJJ3X9od5nB9j0d0XSDd0erMDcmChu0o7lbsPWnLwr+u4aiHXOG2v6m4FbMw8i7GePG5S7Sb1pLh6VHOIPQN9OfgvdIsLM425KzTSCoR86W5K/cVF99jOTSCcD0Vo/eTaSKdmVRZt3RmLq+uu9C2KLbYGMrTWt09o5Tzq6QG7OIsE3fwpr10hPCFeTLaZ2Z2DbPuihpI3Zl+JYWHEYhVws0XeltTpy0mcf1QQypnrBka8Ijj5M/r6n0mJE0kwu9GLMqWNkhmaBDr5ft/6hd6IpGF5b1oYgxM1tYurAQ/+H+DtKKyUr2IR6+jDtZUWX7q8azGx0Mwa6eUuniGHnCYxJ93pjaPSXSI9eOMWWfwd3EpunZuunpQb4Mi+3mhW6VsZ1wpoKGC0RdkuTuKQyDThlSBm82NFtVHtxoAJRdp11Ns92DBk6eqiIu+ZsSmO7Lwg6du3Rh7lqSp0W1uORw0dLLVw3Ctd7rJBeOsrAZ/O6qGYfOV8GlCLpoqlzFWPe7Kj1IfN+/MeF43RWrIHky7A= + #QUAYIO_PASSWORD + - secure: pOQDnzVMvIWOhqlBPIGAZ9WV7UK5Zsb+1s4ywRrp0a30ijaMhQxMqPxme65woKGgfWKC0zmNRWhOeqMzAC/EzqQKBC3pbzZQzPO+aKVtZMJuhaNApA9wcmUmu6Viuyjte5+ydZxphIWu26hEPq2cKOhq7fQ2QUv0kOmPIt7XFgQXylTUfyzOZJtAO5qWMyM3a8h+dGiWan4UE+/RXEmptyENTY2cXpQocqtyM8zKdSMx4XmDQcLXi82Mhqyf+d0c50bCh/O4iZ95OBiUkdxXTbe+tRzet1sefox7+gCaWw5ii25r/ixcUBVg17FzmwXnGO8PDMU/06lFedGR6fQ7rUdylwYnrjTA7MgurtmpHwHaQDYp6hnL04JkhljT+NHITC379Mfyei53q871oq1/RvdFGXaFHZNojVpMg7LD1XmYOb79Xm1x+4fU1YeppRIgj50vz5Hi3n1fc9zz9jf6odWFKvK9feesdPJnaoQRbMpAoSq+c14qUSclVugcEqu1uSZJ347wE7tSaQ5jh1JqanXFdCprPRS03e/qB4aO6e4UT1ZHg1Q5sd+9PLlkwTa2dJZMBN3QKZUTAVROWkXPqRsUcPtsGguIIxIWT2S3jfUBRbLV2migy62b51F7Xnh3sMQ+a0IW8/V+srAKtZowkE6SL2P4577qqqYoJth04L0= From 68db890ee239c6cd6715be88e9cdcc772cd089bd Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 11:46:38 -0800 Subject: [PATCH 130/226] changed Katalon directory permissions --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d0d8e18c4..2ac0c1298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,6 +98,7 @@ matrix: - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins - echo $CLASSPATH From 2f41fd7949d04c413697720c5e1e078062845a50 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 12:45:51 -0800 Subject: [PATCH 131/226] printout the classpath --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2ac0c1298..efc99a02a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,6 +106,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA - cat ./ui_tests/console.properties - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh + - cat ./ui_tests/.classpath #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From 078a0a14272900bd9ca2e1d23c51e4432a4f2479 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 13:27:27 -0800 Subject: [PATCH 132/226] try runfeaturefile --- ui_tests/runTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh index 97a5b840f..79d2780ee 100644 --- a/ui_tests/runTests.sh +++ b/ui_tests/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file From f95002dc35b8fdc26d6b325c271aa65b99d8b6b1 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 13:57:45 -0800 Subject: [PATCH 133/226] try out BDD example project in Travis --- .travis.yml | 10 +- KatalonCucumberBDD/.gitignore | 7 ++ KatalonCucumberBDD/.project | 74 +++++++++++++ .../Include/config/log.properties | 6 + .../Include/features/Login.feature | 32 ++++++ .../com/ea/steps/CucumberEARunner.groovy | 14 +++ .../groovy/com/ea/steps/LoginSteps.groovy | 103 ++++++++++++++++++ KatalonCucumberBDD/KatalonCucumber.prj | 28 +++++ KatalonCucumberBDD/Libs/CustomKeywords.groovy | 5 + .../Libs/internal/GlobalVariable.groovy | 26 +++++ .../input_EnglishHindi_Save.rs | 80 ++++++++++++++ .../input_Initial_Initial.rs | 86 +++++++++++++++ .../input_Login_Login.rs | 86 +++++++++++++++ .../input_Login_Password.rs | 86 +++++++++++++++ .../input_Login_UserName.rs | 86 +++++++++++++++ .../input__FirstName.rs | 86 +++++++++++++++ KatalonCucumberBDD/Profiles/default.glbl | 7 ++ KatalonCucumberBDD/README.md | 9 ++ .../Script1536389635449.groovy | 18 +++ .../Test Cases/ExecuteAutomation_TC1.tc | 8 ++ .../Test Suites/TestSuite1.groovy | 66 +++++++++++ KatalonCucumberBDD/Test Suites/TestSuite1.ts | 20 ++++ KatalonCucumberBDD/console.properties | 7 ++ KatalonCucumberBDD/runTests.bat | 3 + KatalonCucumberBDD/runTests.sh | 3 + ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 0 ...com.kms.katalon.execution.webui.properties | 2 + ...s.katalon.integration.analytics.properties | 0 ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 .../.syncinfo.snap | Bin 0 -> 32 bytes 32 files changed, 953 insertions(+), 5 deletions(-) create mode 100644 KatalonCucumberBDD/.gitignore create mode 100644 KatalonCucumberBDD/.project create mode 100644 KatalonCucumberBDD/Include/config/log.properties create mode 100644 KatalonCucumberBDD/Include/features/Login.feature create mode 100644 KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy create mode 100644 KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy create mode 100644 KatalonCucumberBDD/KatalonCucumber.prj create mode 100644 KatalonCucumberBDD/Libs/CustomKeywords.groovy create mode 100644 KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs create mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs create mode 100644 KatalonCucumberBDD/Profiles/default.glbl create mode 100644 KatalonCucumberBDD/README.md create mode 100644 KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy create mode 100644 KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc create mode 100644 KatalonCucumberBDD/Test Suites/TestSuite1.groovy create mode 100644 KatalonCucumberBDD/Test Suites/TestSuite1.ts create mode 100644 KatalonCucumberBDD/console.properties create mode 100644 KatalonCucumberBDD/runTests.bat create mode 100644 KatalonCucumberBDD/runTests.sh create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties create mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties create mode 100644 config/.metadata/.plugins/org.eclipse.core.resources/.projects/C%%Users%PaulR%Documents%OCWA%OCWA%KatalonCucumberBDD%KatalonCucumber.prj/.syncinfo.snap diff --git a/.travis.yml b/.travis.yml index efc99a02a..3ce8e4d0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,9 +90,9 @@ matrix: - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui_tests + - cd /home/travis/build/bcgov/OCWA/KatalonCucumber - chmod ugo+x runTests.sh - - chmod ugo+x runTestsTesting.sh + #- chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up - cd /home/travis/build/bcgov - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz @@ -104,9 +104,9 @@ matrix: - echo $CLASSPATH #RUN Integration Tests - cd /home/travis/build/bcgov/OCWA - - cat ./ui_tests/console.properties - - xvfb-run --server-args="-screen 0 1440x900x24" ./ui_tests/runTests.sh - - cat ./ui_tests/.classpath + - cat ./KatalonCucumber/console.properties + - xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumber/runTests.sh + - cat ./KatalonCucumber/.classpath #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh diff --git a/KatalonCucumberBDD/.gitignore b/KatalonCucumberBDD/.gitignore new file mode 100644 index 000000000..b7c73c1f6 --- /dev/null +++ b/KatalonCucumberBDD/.gitignore @@ -0,0 +1,7 @@ +# Katalon Studio +Reports/* +ReportFolder/* +.classpath +.settings +/bin/ +Libs/TempTest*.groovy diff --git a/KatalonCucumberBDD/.project b/KatalonCucumberBDD/.project new file mode 100644 index 000000000..fa1b5267e --- /dev/null +++ b/KatalonCucumberBDD/.project @@ -0,0 +1,74 @@ + + + C%%Users%PaulR%Documents%KatalonCucumberBDD%KatalonCucumber.prj + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + + + 1545169329215 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545169329228 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545342090617 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545342090664 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545342237726 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545342237742 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + diff --git a/KatalonCucumberBDD/Include/config/log.properties b/KatalonCucumberBDD/Include/config/log.properties new file mode 100644 index 000000000..8142b1dc2 --- /dev/null +++ b/KatalonCucumberBDD/Include/config/log.properties @@ -0,0 +1,6 @@ +# This file is used to configure Katalon Studio execution log levels. + +# When you need to troubleshoot Katalon Studio issue +# logging.level.com.kms=TRACE + +# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/KatalonCucumberBDD/Include/features/Login.feature b/KatalonCucumberBDD/Include/features/Login.feature new file mode 100644 index 000000000..1b8ab732f --- /dev/null +++ b/KatalonCucumberBDD/Include/features/Login.feature @@ -0,0 +1,32 @@ +#Author: your.email@your.domain.com +#Keywords Summary : +#Feature: List of scenarios. +#Scenario: Business rule through list of steps with arguments. +#Given: Some precondition step +#When: Some key actions +#Then: To observe outcomes or validation +#And,But: To enumerate more Given,When,Then steps +#Scenario Outline: List of steps for data-driven as an Examples and +#Examples: Container for s table +#Background: List of steps run before each of the scenarios +#""" (Doc Strings) +#| (Data Tables) +#@ (Tags/Labels):To group Scenarios +#<> (placeholder) +#"" +## (Comments) +#Sample Feature Definition Template + + +@loginFeature +Feature: Login + Test the login functionality of the application + + @smoke + Scenario: Test the login functionality of EA application + Given I navigate to the login page + And I enter the following for Login + | username | password | + | admin | adminpassword | + And I click the login button + Then I should see the home page \ No newline at end of file diff --git a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy new file mode 100644 index 000000000..a720b7a3e --- /dev/null +++ b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy @@ -0,0 +1,14 @@ +package com.ea.steps + + +import org.junit.runner.RunWith; + +import cucumber.api.CucumberOptions; +import cucumber.api.junit.Cucumber; + + + +@RunWith(Cucumber.class) +@CucumberOptions(features="KatalonCucumberBDD/Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) +public class CucumberEARunner { +} diff --git a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy new file mode 100644 index 000000000..a0de37450 --- /dev/null +++ b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy @@ -0,0 +1,103 @@ +package com.ea.steps +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI + +import cucumber.api.TypeRegistry; +import cucumber.api.TypeRegistryConfigurer; +import cucumber.api.java.en.And +import cucumber.api.java.en.Given +import cucumber.api.java.en.Then +import cucumber.api.java.en.When +import io.cucumber.datatable.DataTableType; +import io.cucumber.datatable.TableEntryTransformer; + + +/* + * Author: Karthik KK + * Company: ExecuteAutomation + * Type: StepDefinition + * Step : LoginStep + */ +class LoginSteps { + @Given("I navigate to the login page") + def I_navigate_to_the_login_page() { + WebUI.openBrowser('') + WebUI.navigateToUrl('http://www.executeautomation.com/demosite/Login.html') + } + + + //Obsolete step + @When('I enter the username as "(.*) and password as "(.*)"') + def I_enter_username_password(String userName, String password) { + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), userName) + + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), password) + } + + @And("I enter the following for Login") + def I_enter_the_following_for_login(List table){ + // Way 1 - To get data from DataTable Type + // List> data = table.asMaps(String.class, String.class); + + // Way 2 - To get work with custom types using Lust + // //Create an ArrayList + // List users = new ArrayList(); + // //Store all the users + // users = table.asList(User.class); + + + //Iterate through the values + for (User user: table){ + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), user.username) + + WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), user.password) + } + } + + + @Then("I click the login button") + def I_Click_login_button() { + WebUI.click(findTestObject('Object Repository/Page_Execute Automation/input_Login_Login')) + } + + @Then("I should see the home page") + def I_Should_see_the_home_page(){ + + //Assertions has been done ! + } +} + + +//Custom class responsible to get UserName and Password from table steps +class User { + public String username; + public String password; + + public User(String userName, String passWord) { + username= userName; + password = passWord; + } +} + + +//Custom Transformer to convert the custom User type +class Configurer implements TypeRegistryConfigurer { + + @Override + public void configureTypeRegistry(TypeRegistry registry) { + + registry.defineDataTableType(new DataTableType(User.class, new TableEntryTransformer() { + @Override + public User transform(Map entry) { + return new User(entry.get("username"),entry.get("password")); + } + })); + } + + @Override + public Locale locale() { + return Locale.ENGLISH; + } + +} diff --git a/KatalonCucumberBDD/KatalonCucumber.prj b/KatalonCucumberBDD/KatalonCucumber.prj new file mode 100644 index 000000000..c48d3b350 --- /dev/null +++ b/KatalonCucumberBDD/KatalonCucumber.prj @@ -0,0 +1,28 @@ + + + Katalon with Cucumber support + KatalonCucumber + + 3d119e91-3135-4c99-aab6-6022650ddbe1 + 5.9.0 + 0 + + + + Include/scripts/groovy + + + + + Include/scripts/groovy + + + Include/features + + + Include/config + + + + GENERIC + diff --git a/KatalonCucumberBDD/Libs/CustomKeywords.groovy b/KatalonCucumberBDD/Libs/CustomKeywords.groovy new file mode 100644 index 000000000..c595a4f8a --- /dev/null +++ b/KatalonCucumberBDD/Libs/CustomKeywords.groovy @@ -0,0 +1,5 @@ + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ + diff --git a/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy b/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy new file mode 100644 index 000000000..0f60ebe2b --- /dev/null +++ b/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy @@ -0,0 +1,26 @@ +package internal + +import com.kms.katalon.core.configuration.RunConfiguration +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase + +/** + * This class is generated automatically by Katalon Studio and should not be modified or deleted. + */ +public class GlobalVariable { + + + static { + def allVariables = [:] + allVariables.put('default', [:]) + + String profileName = RunConfiguration.getExecutionProfile() + + def selectedVariables = allVariables[profileName] + + } +} diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs new file mode 100644 index 000000000..ec456a8cc --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs @@ -0,0 +1,80 @@ + + + + input_EnglishHindi_Save + + ecd9d263-24cb-4f55-86e0-5f8b37295ddd + + + XPATH + //input[@name='Save'] + + + XPATH + false + + true + equals + tag + Main + input + + + true + equals + name + Main + Save + + + true + equals + type + Main + button + + + false + equals + value + Main + Save + + + false + equals + xpath + Main + id("details")/table[1]/tbody[1]/tr[7]/td[1]/input[1] + + + true + equals + xpath:attributes + //input[@name='Save'] + + + false + equals + xpath:idRelative + //form[@id='details']/table/tbody/tr[7]/td/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Languages Known'])[1]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Click For'])[1]/preceding::input[1] + + + false + equals + xpath:position + //tr[7]/td/input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs new file mode 100644 index 000000000..4c0d2089d --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs @@ -0,0 +1,86 @@ + + + + input_Initial_Initial + + 4147d414-db74-43aa-93cf-b83588a4a5ac + + + XPATH + //input[@id='Initial'] + + + XPATH + false + + true + equals + tag + Main + input + + + true + equals + id + Main + Initial + + + true + equals + name + Main + Initial + + + true + equals + type + Main + text + + + false + equals + xpath + Main + id("Initial") + + + true + equals + xpath:attributes + //input[@id='Initial'] + + + false + equals + xpath:idRelative + //form[@id='details']/table/tbody/tr[2]/td[2]/span/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Initial'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[2]/preceding::input[1] + + + false + equals + xpath:position + //input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs new file mode 100644 index 000000000..1f21fdbfa --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs @@ -0,0 +1,86 @@ + + + + input_Login_Login + + f6f35be9-c6a2-4e27-91ea-56d2eb891b0f + + + XPATH + //input[@name='Login'] + + + XPATH + false + + true + equals + tag + Main + input + + + true + equals + name + Main + Login + + + true + equals + type + Main + submit + + + false + equals + value + Main + Login + + + false + equals + xpath + Main + id("userName")/p[3]/input[1] + + + true + equals + xpath:attributes + //input[@name='Login'] + + + false + equals + xpath:idRelative + //form[@id='userName']/p[3]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[3]/input[1]')])[1]/preceding::input[1] + + + false + equals + xpath:position + //p[3]/input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs new file mode 100644 index 000000000..55092ed9f --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs @@ -0,0 +1,86 @@ + + + + input_Login_Password + + 8b324a72-4913-4c7a-b70a-82f50bd94358 + + + XPATH + //input[@name='Password'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + maxlength + Main + 10 + + + true + equals + name + Main + Password + + + true + equals + type + Main + text + + + false + equals + xpath + Main + id("userName")/p[2]/input[1] + + + true + equals + xpath:attributes + //input[@name='Password'] + + + false + equals + xpath:idRelative + //form[@id='userName']/p[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[1]/input[1]')])[1]/preceding::input[2] + + + false + equals + xpath:position + //p[2]/input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs new file mode 100644 index 000000000..a0645ef4b --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs @@ -0,0 +1,86 @@ + + + + input_Login_UserName + + ae864cbc-fb6c-426f-a41c-4fa206b8b905 + + + XPATH + //input[@name='UserName'] + + + XPATH + false + + true + equals + tag + Main + input + + + false + equals + maxlength + Main + 10 + + + true + equals + name + Main + UserName + + + true + equals + type + Main + text + + + false + equals + xpath + Main + id("userName")/p[1]/input[1] + + + true + equals + xpath:attributes + //input[@name='UserName'] + + + false + equals + xpath:idRelative + //form[@id='userName']/p/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[1]/input[1]')])[1]/preceding::input[3] + + + false + equals + xpath:position + //input + + diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs new file mode 100644 index 000000000..5bb0a455f --- /dev/null +++ b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs @@ -0,0 +1,86 @@ + + + + input__FirstName + + 96539eeb-add3-4a43-8e44-b9dcb7056248 + + + XPATH + //input[@id='FirstName'] + + + XPATH + false + + true + equals + tag + Main + input + + + true + equals + id + Main + FirstName + + + true + equals + name + Main + FirstName + + + true + equals + type + Main + text + + + false + equals + xpath + Main + id("FirstName") + + + true + equals + xpath:attributes + //input[@id='FirstName'] + + + false + equals + xpath:idRelative + //form[@id='details']/table/tbody/tr[3]/td[2]/span/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[2]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Middle Name'])[1]/preceding::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Gender'])[1]/preceding::input[2] + + + false + equals + xpath:position + //tr[3]/td[2]/span/input + + diff --git a/KatalonCucumberBDD/Profiles/default.glbl b/KatalonCucumberBDD/Profiles/default.glbl new file mode 100644 index 000000000..de1027f04 --- /dev/null +++ b/KatalonCucumberBDD/Profiles/default.glbl @@ -0,0 +1,7 @@ + + + + default + + true + diff --git a/KatalonCucumberBDD/README.md b/KatalonCucumberBDD/README.md new file mode 100644 index 000000000..21e39b2ff --- /dev/null +++ b/KatalonCucumberBDD/README.md @@ -0,0 +1,9 @@ +## Katalon with Cucumber BDD support + +Starting Katalon Studio 5.7, Cucumber API is supported as an part of Katalon studio out-of-box, meaning, you dont really have to add any cucumber library to Katalon studio as an external JAR reference, rather, its available within Katalon studio. + +## About this Repo +This repo contains the complete demostration of working with Cucumber BDD in Katalon Studio 5.7 + +## Video Demostration +Here is the complete video explaning how to get started with Cucumber in Katalon studio https://www.youtube.com/watch?v=vwCSfUhsivY diff --git a/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy b/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy new file mode 100644 index 000000000..ce5e87e42 --- /dev/null +++ b/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy @@ -0,0 +1,18 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.ea.steps.CucumberEARunner +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testobject.TestObject as TestObject +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import internal.GlobalVariable as GlobalVariable + +CucumberKW.runWithCucumberRunner(CucumberEARunner.class) diff --git a/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc b/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc new file mode 100644 index 000000000..5aea93271 --- /dev/null +++ b/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc @@ -0,0 +1,8 @@ + + + + ExecuteAutomation_TC1 + + + 9ccc1ff2-1a70-4f4b-ad95-dad93a1390b8 + diff --git a/KatalonCucumberBDD/Test Suites/TestSuite1.groovy b/KatalonCucumberBDD/Test Suites/TestSuite1.groovy new file mode 100644 index 000000000..49ab4777d --- /dev/null +++ b/KatalonCucumberBDD/Test Suites/TestSuite1.groovy @@ -0,0 +1,66 @@ +import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint +import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase +import static com.kms.katalon.core.testdata.TestDataFactory.findTestData +import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject + +import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint +import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory +import com.kms.katalon.core.model.FailureHandling as FailureHandling +import com.kms.katalon.core.testcase.TestCase as TestCase +import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory +import com.kms.katalon.core.testdata.TestData as TestData +import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory +import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository +import com.kms.katalon.core.testobject.TestObject as TestObject + +import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS +import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI +import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile + +import internal.GlobalVariable as GlobalVariable + +import com.kms.katalon.core.annotation.SetUp +import com.kms.katalon.core.annotation.SetupTestCase +import com.kms.katalon.core.annotation.TearDown +import com.kms.katalon.core.annotation.TearDownTestCase + +/** + * Some methods below are samples for using SetUp/TearDown in a test suite. + */ + +/** + * Setup test suite environment. + */ +@SetUp(skipped = true) // Please change skipped to be false to activate this method. +def setUp() { + // Put your code here. +} + +/** + * Clean test suites environment. + */ +@TearDown(skipped = true) // Please change skipped to be false to activate this method. +def tearDown() { + // Put your code here. +} + +/** + * Run before each test case starts. + */ +@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. +def setupTestCase() { + // Put your code here. +} + +/** + * Run after each test case ends. + */ +@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. +def tearDownTestCase() { + // Put your code here. +} + +/** + * References: + * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ + */ \ No newline at end of file diff --git a/KatalonCucumberBDD/Test Suites/TestSuite1.ts b/KatalonCucumberBDD/Test Suites/TestSuite1.ts new file mode 100644 index 000000000..12a451e12 --- /dev/null +++ b/KatalonCucumberBDD/Test Suites/TestSuite1.ts @@ -0,0 +1,20 @@ + + + + TestSuite1 + + false + 2018-12-20T13:53:39 + + 0 + 30 + true + false + e8a1ffd6-0ef9-4ac4-9cad-c711a822a0a5 + + 2521c26f-59d1-446f-9fbe-59281ccceb99 + false + true + Test Cases/ExecuteAutomation_TC1 + + diff --git a/KatalonCucumberBDD/console.properties b/KatalonCucumberBDD/console.properties new file mode 100644 index 000000000..710966d84 --- /dev/null +++ b/KatalonCucumberBDD/console.properties @@ -0,0 +1,7 @@ +#Sat Sep 08 18:41:21 NZST 2018 +deviceId= +kobitonDeviceId= +qTestDestId= +qTestDestType= +remoteWebDriverType=Selenium +remoteWebDriverUrl= diff --git a/KatalonCucumberBDD/runTests.bat b/KatalonCucumberBDD/runTests.bat new file mode 100644 index 000000000..41e1656d0 --- /dev/null +++ b/KatalonCucumberBDD/runTests.bat @@ -0,0 +1,3 @@ +echo "Starting tests" + +C:\Users\PaulR\Documents\Katalon_Studio_Windows_64-5.9.0\Katalon_Studio_Windows_64-5.9.0\katalon -noSplash -runMode=console -projectPath="C:\Users\PaulR\Documents\OCWA\OCWA\KatalonCucumberBDD\KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/KatalonCucumberBDD/runTests.sh b/KatalonCucumberBDD/runTests.sh new file mode 100644 index 000000000..40c1e77a8 --- /dev/null +++ b/KatalonCucumberBDD/runTests.sh @@ -0,0 +1,3 @@ +echo "Starting tests" + +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/KatalonCucumberBDD/KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties new file mode 100644 index 000000000..e69de29bb diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties new file mode 100644 index 000000000..e69de29bb diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties new file mode 100644 index 000000000..a50388cc6 --- /dev/null +++ b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties @@ -0,0 +1,2 @@ +#Sat Sep 08 18:41:20 NZST 2018 +execution.default.selectingCapturedObjectSelectorMethod="XPATH" diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties new file mode 100644 index 000000000..e69de29bb diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties new file mode 100644 index 000000000..e69de29bb diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties new file mode 100644 index 000000000..e69de29bb diff --git a/config/.metadata/.plugins/org.eclipse.core.resources/.projects/C%%Users%PaulR%Documents%OCWA%OCWA%KatalonCucumberBDD%KatalonCucumber.prj/.syncinfo.snap b/config/.metadata/.plugins/org.eclipse.core.resources/.projects/C%%Users%PaulR%Documents%OCWA%OCWA%KatalonCucumberBDD%KatalonCucumber.prj/.syncinfo.snap new file mode 100644 index 0000000000000000000000000000000000000000..0b368ce14fbcdffc79d020bc00b88646cda52674 GIT binary patch literal 32 acmZ?R*xjhShe1S2b=vdAllRFvpz#6ORt Date: Thu, 20 Dec 2018 14:18:32 -0800 Subject: [PATCH 134/226] fixed path for KatalonCucumberBDD --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ce8e4d0d..defd89470 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,7 +90,7 @@ matrix: - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/KatalonCucumber + - cd /home/travis/build/bcgov/OCWA/KatalonCucumberBDD - chmod ugo+x runTests.sh #- chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up @@ -104,9 +104,9 @@ matrix: - echo $CLASSPATH #RUN Integration Tests - cd /home/travis/build/bcgov/OCWA - - cat ./KatalonCucumber/console.properties - - xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumber/runTests.sh - - cat ./KatalonCucumber/.classpath + - cat ./KatalonCucumberBDD/console.properties + - xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumberBDD/runTests.sh + - cat ./KatalonCucumberBDD/.classpath #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh From 1c39fc6d52813059ed3e7fb0a6468d7ab42179a3 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 14:43:00 -0800 Subject: [PATCH 135/226] fixed executionProfile --- KatalonCucumberBDD/runTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KatalonCucumberBDD/runTests.sh b/KatalonCucumberBDD/runTests.sh index 40c1e77a8..e88497f6a 100644 --- a/KatalonCucumberBDD/runTests.sh +++ b/KatalonCucumberBDD/runTests.sh @@ -1,3 +1,3 @@ echo "Starting tests" -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/KatalonCucumberBDD/KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file +katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/KatalonCucumberBDD/KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file From 0213fbe635961514a9ea9a9b6616a786bb509ea2 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 15:14:39 -0800 Subject: [PATCH 136/226] update to classpath --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index defd89470..cc072f0fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ matrix: - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins + - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar - echo $CLASSPATH #RUN Integration Tests - cd /home/travis/build/bcgov/OCWA From 06243737af27f590d88e4ad86924ce821b880b85 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 15:48:18 -0800 Subject: [PATCH 137/226] try an alternate approach to calling katalon --- .travis.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc072f0fa..32beb1efc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,20 +94,22 @@ matrix: - chmod ugo+x runTests.sh #- chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up - - cd /home/travis/build/bcgov + #- cd /home/travis/build/bcgov + - cd /usr/local/bin - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - - export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - - export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar - - echo $CLASSPATH + #- export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} + #- export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar + #- echo $CLASSPATH #RUN Integration Tests - - cd /home/travis/build/bcgov/OCWA - - cat ./KatalonCucumberBDD/console.properties - - xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumberBDD/runTests.sh - - cat ./KatalonCucumberBDD/.classpath + - cd Katalon_Studio_Linux_64-${KATALON_VERSION} + #- cd /home/travis/build/bcgov/OCWA + #- xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumberBDD/runTests.sh + #- cat ./KatalonCucumberBDD/.classpath #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh + - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" env: From 597dfe6d382cce556d36642216233ae54ff6bf58 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 20 Dec 2018 16:20:00 -0800 Subject: [PATCH 138/226] sudo stuff to make it happen --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32beb1efc..c9b7a7566 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,16 +90,16 @@ matrix: - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/KatalonCucumberBDD + - cd /home/travis/build/bcgov/OCWA/ui_tests - chmod ugo+x runTests.sh #- chmod ugo+x runTestsTesting.sh #added line to install Katalon a directory up #- cd /home/travis/build/bcgov - cd /usr/local/bin - - wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} + - sudo wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} #- export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} #- export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar #- echo $CLASSPATH From 379b3a025b108c655d18936ac2a9bace3cc79975 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 11:54:37 -0800 Subject: [PATCH 139/226] cleaned up Katalon tests --- .gitignore | 419 +++++++++--------- .travis.yml | 17 +- KatalonCucumberBDD/.gitignore | 7 - KatalonCucumberBDD/.project | 74 ---- .../Include/config/log.properties | 6 - .../Include/features/Login.feature | 32 -- .../com/ea/steps/CucumberEARunner.groovy | 14 - .../groovy/com/ea/steps/LoginSteps.groovy | 103 ----- KatalonCucumberBDD/KatalonCucumber.prj | 28 -- KatalonCucumberBDD/Libs/CustomKeywords.groovy | 5 - .../Libs/internal/GlobalVariable.groovy | 26 -- .../input_EnglishHindi_Save.rs | 80 ---- .../input_Initial_Initial.rs | 86 ---- .../input_Login_Login.rs | 86 ---- .../input_Login_Password.rs | 86 ---- .../input_Login_UserName.rs | 86 ---- .../input__FirstName.rs | 86 ---- KatalonCucumberBDD/Profiles/default.glbl | 7 - KatalonCucumberBDD/README.md | 9 - .../Script1536389635449.groovy | 18 - .../Test Cases/ExecuteAutomation_TC1.tc | 8 - .../Test Suites/TestSuite1.groovy | 66 --- KatalonCucumberBDD/Test Suites/TestSuite1.ts | 20 - KatalonCucumberBDD/console.properties | 7 - KatalonCucumberBDD/runTests.bat | 3 - KatalonCucumberBDD/runTests.sh | 3 - ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 0 ...com.kms.katalon.execution.webui.properties | 2 - ...s.katalon.integration.analytics.properties | 0 ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 config/recent_projects | Bin 0 -> 2032 bytes ui-tests/.gitignore | 5 - ui-tests/.project | 56 --- ui-tests/Include/config/log.properties | 6 - ...discussion_status_approved_request.feature | 7 - .../manual_output_checking_component.feature | 19 - .../team_sharing_component.feature | 22 - .../output_checker/adjudicate request.feature | 17 - .../output_checker/claim_request.feature | 14 - .../output_checker/undo_approval.feature | 9 - ...tered_requests_for_output_checkers.feature | 12 - ..._approved_output_files_outside_SRE.feature | 7 - .../requester/canceling_request.feature | 7 - .../requester/create_a_new_request.feature | 39 -- .../features/requester/draft_requests.feature | 16 - .../edit_previously_submitted_request.feature | 8 - .../features/requester/notifications.feature | 23 - .../requester/request_discussion.feature | 15 - ...edit_project_team_members_requests.feature | 15 - .../requester/see_requests_by_status.feature | 18 - .../requester/view_request_details.feature | 7 - .../scripts/groovy/MyCucumberRunner.groovy | 26 -- .../groovy/Requester_step_def_kr.groovy | 100 ----- .../groovy/Requester_step_def_ks.groovy | 156 ------- ui-tests/LICENSE | 201 --------- ui-tests/Libs/CustomKeywords.groovy | 9 - ui-tests/Libs/internal/GlobalVariable.groovy | 33 -- ui-tests/OCWA.prj | 28 -- .../a_OCWA Export Tool.rs | 86 ---- .../button_All.rs | 97 ---- .../div_My RequestsAllDraftQueuedI.rs | 67 --- .../div_Request Name_Content-ve26f.rs | 66 --- .../div_You have no requests.rs | 73 --- .../h1_gfggggg.rs | 72 --- .../Page_OCWA Development Version/span_All.rs | 72 --- .../span_Cancel (1).rs | 72 --- .../span_Cancel.rs | 72 --- .../span_Draft.rs | 72 --- .../span_Login (1).rs | 54 --- .../span_New Request.rs | 83 ---- .../span_Save Close (1).rs | 74 ---- .../span_Save Close.rs | 70 --- .../table_StatusRequest Identifier.rs | 67 --- ui-tests/Profiles/Travis.glbl | 12 - .../Script1544053608217.groovy | 28 -- .../Script1544808549240.groovy | 23 - .../Requester/Run cucumber tests.tc | 8 - .../Test Cases/Requester/test_case_testing.tc | 8 - .../Test Suites/Run OCWA test cases.groovy | 66 --- ui-tests/Test Suites/Run OCWA test cases.ts | 20 - ui-tests/Test Suites/TestingTestSuite.groovy | 66 --- ui-tests/Test Suites/TestingTestSuite.ts | 20 - .../bin/groovy/Requester_step_def_kr.class | Bin 6547 -> 0 bytes .../bin/groovy/Requester_step_def_ks.class | Bin 6842 -> 0 bytes .../random_test_request_name.class | Bin 3283 -> 0 bytes ui-tests/bin/lib/CustomKeywords.class | Bin 2440 -> 0 bytes .../bin/lib/internal/GlobalVariable.class | Bin 3510 -> 0 bytes ui-tests/console.properties | 5 - ui-tests/runTests.sh | 3 - ui-tests/runTestsTesting.sh | 3 - ...atalon.core.db.DatabaseSettings.properties | 0 ...alon.composer.testcase.settings.properties | 0 .../com.kms.katalon.execution.properties | 6 - ...com.kms.katalon.execution.webui.properties | 6 - ...s.katalon.integration.analytics.properties | 2 - ...om.kms.katalon.integration.jira.properties | 0 ...m.kms.katalon.integration.qtest.properties | 0 ui-tests/sonar-project.properties | 32 -- ui_tests/.gitignore | 1 + ui_tests/.project | 166 +++---- ui_tests/Data Files/TestFile1.dat | 16 + ui_tests/Data Files/TestFile2.dat | 16 + ui_tests/Include/features/Login.feature | 32 -- .../groovy/Requester_step_def_ks.groovy | 159 +++---- .../com/ea/steps/CucumberEARunner.groovy | 14 - .../groovy/com/ea/steps/LoginSteps.groovy | 103 ----- .../random_test_request_name.groovy | 0 ui_tests/Libs/CustomKeywords.groovy | 4 + ui_tests/Libs/internal/GlobalVariable.groovy | 2 +- .../input_Password_login.rs | 214 ++++----- .../input_Password_password.rs | 214 ++++----- .../input_Username or email_userna.rs | 226 +++++----- .../a_Discussion.rs | 189 ++++---- .../input_Request Name_name.rs | 222 +++++----- .../span_Save (1).rs | 130 +++--- .../span_Submit for Review.rs | 108 ++--- .../span_Withdraw.rs | 152 +++---- .../Script1536389635449.groovy | 18 - .../Script1545256102660.groovy | 4 + ui_tests/Test Cases/ExecuteAutomation_TC1.tc | 8 - ui_tests/Test Suites/CucumberSuite.ts | 40 +- ui_tests/Test Suites/TestSuite1.groovy | 66 --- ui_tests/Test Suites/TestSuite1.ts | 20 - ui_tests/runTests.sh | 3 - ...s.katalon.integration.analytics.properties | 9 + 127 files changed, 1185 insertions(+), 4615 deletions(-) delete mode 100644 KatalonCucumberBDD/.gitignore delete mode 100644 KatalonCucumberBDD/.project delete mode 100644 KatalonCucumberBDD/Include/config/log.properties delete mode 100644 KatalonCucumberBDD/Include/features/Login.feature delete mode 100644 KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy delete mode 100644 KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy delete mode 100644 KatalonCucumberBDD/KatalonCucumber.prj delete mode 100644 KatalonCucumberBDD/Libs/CustomKeywords.groovy delete mode 100644 KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs delete mode 100644 KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs delete mode 100644 KatalonCucumberBDD/Profiles/default.glbl delete mode 100644 KatalonCucumberBDD/README.md delete mode 100644 KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy delete mode 100644 KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc delete mode 100644 KatalonCucumberBDD/Test Suites/TestSuite1.groovy delete mode 100644 KatalonCucumberBDD/Test Suites/TestSuite1.ts delete mode 100644 KatalonCucumberBDD/console.properties delete mode 100644 KatalonCucumberBDD/runTests.bat delete mode 100644 KatalonCucumberBDD/runTests.sh delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties delete mode 100644 KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties create mode 100644 config/recent_projects delete mode 100644 ui-tests/.gitignore delete mode 100644 ui-tests/.project delete mode 100644 ui-tests/Include/config/log.properties delete mode 100644 ui-tests/Include/features/administator/export_discussion_status_approved_request.feature delete mode 100644 ui-tests/Include/features/administator/manual_output_checking_component.feature delete mode 100644 ui-tests/Include/features/administator/team_sharing_component.feature delete mode 100644 ui-tests/Include/features/output_checker/adjudicate request.feature delete mode 100644 ui-tests/Include/features/output_checker/claim_request.feature delete mode 100644 ui-tests/Include/features/output_checker/undo_approval.feature delete mode 100644 ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature delete mode 100644 ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature delete mode 100644 ui-tests/Include/features/requester/canceling_request.feature delete mode 100644 ui-tests/Include/features/requester/create_a_new_request.feature delete mode 100644 ui-tests/Include/features/requester/draft_requests.feature delete mode 100644 ui-tests/Include/features/requester/edit_previously_submitted_request.feature delete mode 100644 ui-tests/Include/features/requester/notifications.feature delete mode 100644 ui-tests/Include/features/requester/request_discussion.feature delete mode 100644 ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature delete mode 100644 ui-tests/Include/features/requester/see_requests_by_status.feature delete mode 100644 ui-tests/Include/features/requester/view_request_details.feature delete mode 100644 ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy delete mode 100644 ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy delete mode 100644 ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy delete mode 100644 ui-tests/LICENSE delete mode 100644 ui-tests/Libs/CustomKeywords.groovy delete mode 100644 ui-tests/Libs/internal/GlobalVariable.groovy delete mode 100644 ui-tests/OCWA.prj delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs delete mode 100644 ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs delete mode 100644 ui-tests/Profiles/Travis.glbl delete mode 100644 ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy delete mode 100644 ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy delete mode 100644 ui-tests/Test Cases/Requester/Run cucumber tests.tc delete mode 100644 ui-tests/Test Cases/Requester/test_case_testing.tc delete mode 100644 ui-tests/Test Suites/Run OCWA test cases.groovy delete mode 100644 ui-tests/Test Suites/Run OCWA test cases.ts delete mode 100644 ui-tests/Test Suites/TestingTestSuite.groovy delete mode 100644 ui-tests/Test Suites/TestingTestSuite.ts delete mode 100644 ui-tests/bin/groovy/Requester_step_def_kr.class delete mode 100644 ui-tests/bin/groovy/Requester_step_def_ks.class delete mode 100644 ui-tests/bin/keyword/test_OCWA_keywords/random_test_request_name.class delete mode 100644 ui-tests/bin/lib/CustomKeywords.class delete mode 100644 ui-tests/bin/lib/internal/GlobalVariable.class delete mode 100644 ui-tests/console.properties delete mode 100644 ui-tests/runTests.sh delete mode 100644 ui-tests/runTestsTesting.sh delete mode 100644 ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.execution.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.execution.webui.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.jira.properties delete mode 100644 ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties delete mode 100644 ui-tests/sonar-project.properties create mode 100644 ui_tests/Data Files/TestFile1.dat create mode 100644 ui_tests/Data Files/TestFile2.dat delete mode 100644 ui_tests/Include/features/Login.feature delete mode 100644 ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy delete mode 100644 ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy rename {ui-tests => ui_tests}/Keywords/test_OCWA_keywords/random_test_request_name.groovy (100%) rename {ui-tests => ui_tests}/Object Repository/Page_Log in to ocwa/input_Password_login.rs (96%) rename {ui-tests => ui_tests}/Object Repository/Page_Log in to ocwa/input_Password_password.rs (96%) rename {ui-tests => ui_tests}/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs (96%) rename ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs => ui_tests/Object Repository/Page_OCWA Development Version/a_Discussion.rs (58%) rename {ui-tests => ui_tests}/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs (97%) rename ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs => ui_tests/Object Repository/Page_OCWA Development Version/span_Save (1).rs (64%) rename ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs => ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs (64%) rename ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs => ui_tests/Object Repository/Page_OCWA Development Version/span_Withdraw.rs (67%) delete mode 100644 ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy delete mode 100644 ui_tests/Test Cases/ExecuteAutomation_TC1.tc delete mode 100644 ui_tests/Test Suites/TestSuite1.groovy delete mode 100644 ui_tests/Test Suites/TestSuite1.ts delete mode 100644 ui_tests/runTests.sh diff --git a/.gitignore b/.gitignore index 855dcf914..bfb1a55a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,208 +1,211 @@ -# General Ignore -#bin/ -.idea -.DS_Store - -#Helm -helm/ocwa/charts/* -helm/ocwa/config.yaml - -# Golang Ignore - -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - - -# Node Ignore - -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - - -# Python Ignore - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -#lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ +# General Ignore +#bin/ +.idea +.DS_Store + +#Helm +helm/ocwa/charts/* +helm/ocwa/config.yaml + +# Golang Ignore + +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + + +# Node Ignore + +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless + + +# Python Ignore + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +#lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ + +#Katalon +config/.metadata \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index c9b7a7566..31cfdfca9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,29 +86,18 @@ matrix: - sudo pip3 install -e . - python3 wsgi.py & - #Katalon requires OpenJDK 8 installed seperately + #Katalon requires OpenJDK 8 installed separately - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk - #Install Katalon Studios - - cd /home/travis/build/bcgov/OCWA/ui_tests - - chmod ugo+x runTests.sh - #- chmod ugo+x runTestsTesting.sh - #added line to install Katalon a directory up - #- cd /home/travis/build/bcgov + #Install Katalon Studios - cd /usr/local/bin - sudo wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - #- export PATH=$PATH:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION} - #- export CLASSPATH=/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/plugins/org.junit_4.12.0.jar:/home/travis/build/bcgov/Katalon_Studio_Linux_64-${KATALON_VERSION}/jre/lib/rt.jar - #- echo $CLASSPATH + #RUN Integration Tests - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - #- cd /home/travis/build/bcgov/OCWA - #- xvfb-run --server-args="-screen 0 1440x900x24" ./KatalonCucumberBDD/runTests.sh - #- cat ./KatalonCucumberBDD/.classpath - #- xvfb-run --server-args="-screen 0 1440x900x24" ./runTests.sh - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" diff --git a/KatalonCucumberBDD/.gitignore b/KatalonCucumberBDD/.gitignore deleted file mode 100644 index b7c73c1f6..000000000 --- a/KatalonCucumberBDD/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Katalon Studio -Reports/* -ReportFolder/* -.classpath -.settings -/bin/ -Libs/TempTest*.groovy diff --git a/KatalonCucumberBDD/.project b/KatalonCucumberBDD/.project deleted file mode 100644 index fa1b5267e..000000000 --- a/KatalonCucumberBDD/.project +++ /dev/null @@ -1,74 +0,0 @@ - - - C%%Users%PaulR%Documents%KatalonCucumberBDD%KatalonCucumber.prj - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.groovy.core.groovyNature - org.eclipse.jdt.core.javanature - - - - 1545169329215 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1545169329228 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 1545342090617 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1545342090664 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 1545342237726 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1545342237742 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - diff --git a/KatalonCucumberBDD/Include/config/log.properties b/KatalonCucumberBDD/Include/config/log.properties deleted file mode 100644 index 8142b1dc2..000000000 --- a/KatalonCucumberBDD/Include/config/log.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file is used to configure Katalon Studio execution log levels. - -# When you need to troubleshoot Katalon Studio issue -# logging.level.com.kms=TRACE - -# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/KatalonCucumberBDD/Include/features/Login.feature b/KatalonCucumberBDD/Include/features/Login.feature deleted file mode 100644 index 1b8ab732f..000000000 --- a/KatalonCucumberBDD/Include/features/Login.feature +++ /dev/null @@ -1,32 +0,0 @@ -#Author: your.email@your.domain.com -#Keywords Summary : -#Feature: List of scenarios. -#Scenario: Business rule through list of steps with arguments. -#Given: Some precondition step -#When: Some key actions -#Then: To observe outcomes or validation -#And,But: To enumerate more Given,When,Then steps -#Scenario Outline: List of steps for data-driven as an Examples and -#Examples: Container for s table -#Background: List of steps run before each of the scenarios -#""" (Doc Strings) -#| (Data Tables) -#@ (Tags/Labels):To group Scenarios -#<> (placeholder) -#"" -## (Comments) -#Sample Feature Definition Template - - -@loginFeature -Feature: Login - Test the login functionality of the application - - @smoke - Scenario: Test the login functionality of EA application - Given I navigate to the login page - And I enter the following for Login - | username | password | - | admin | adminpassword | - And I click the login button - Then I should see the home page \ No newline at end of file diff --git a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy deleted file mode 100644 index a720b7a3e..000000000 --- a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy +++ /dev/null @@ -1,14 +0,0 @@ -package com.ea.steps - - -import org.junit.runner.RunWith; - -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; - - - -@RunWith(Cucumber.class) -@CucumberOptions(features="KatalonCucumberBDD/Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) -public class CucumberEARunner { -} diff --git a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy b/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy deleted file mode 100644 index a0de37450..000000000 --- a/KatalonCucumberBDD/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy +++ /dev/null @@ -1,103 +0,0 @@ -package com.ea.steps -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI - -import cucumber.api.TypeRegistry; -import cucumber.api.TypeRegistryConfigurer; -import cucumber.api.java.en.And -import cucumber.api.java.en.Given -import cucumber.api.java.en.Then -import cucumber.api.java.en.When -import io.cucumber.datatable.DataTableType; -import io.cucumber.datatable.TableEntryTransformer; - - -/* - * Author: Karthik KK - * Company: ExecuteAutomation - * Type: StepDefinition - * Step : LoginStep - */ -class LoginSteps { - @Given("I navigate to the login page") - def I_navigate_to_the_login_page() { - WebUI.openBrowser('') - WebUI.navigateToUrl('http://www.executeautomation.com/demosite/Login.html') - } - - - //Obsolete step - @When('I enter the username as "(.*) and password as "(.*)"') - def I_enter_username_password(String userName, String password) { - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), userName) - - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), password) - } - - @And("I enter the following for Login") - def I_enter_the_following_for_login(List table){ - // Way 1 - To get data from DataTable Type - // List> data = table.asMaps(String.class, String.class); - - // Way 2 - To get work with custom types using Lust - // //Create an ArrayList - // List users = new ArrayList(); - // //Store all the users - // users = table.asList(User.class); - - - //Iterate through the values - for (User user: table){ - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), user.username) - - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), user.password) - } - } - - - @Then("I click the login button") - def I_Click_login_button() { - WebUI.click(findTestObject('Object Repository/Page_Execute Automation/input_Login_Login')) - } - - @Then("I should see the home page") - def I_Should_see_the_home_page(){ - - //Assertions has been done ! - } -} - - -//Custom class responsible to get UserName and Password from table steps -class User { - public String username; - public String password; - - public User(String userName, String passWord) { - username= userName; - password = passWord; - } -} - - -//Custom Transformer to convert the custom User type -class Configurer implements TypeRegistryConfigurer { - - @Override - public void configureTypeRegistry(TypeRegistry registry) { - - registry.defineDataTableType(new DataTableType(User.class, new TableEntryTransformer() { - @Override - public User transform(Map entry) { - return new User(entry.get("username"),entry.get("password")); - } - })); - } - - @Override - public Locale locale() { - return Locale.ENGLISH; - } - -} diff --git a/KatalonCucumberBDD/KatalonCucumber.prj b/KatalonCucumberBDD/KatalonCucumber.prj deleted file mode 100644 index c48d3b350..000000000 --- a/KatalonCucumberBDD/KatalonCucumber.prj +++ /dev/null @@ -1,28 +0,0 @@ - - - Katalon with Cucumber support - KatalonCucumber - - 3d119e91-3135-4c99-aab6-6022650ddbe1 - 5.9.0 - 0 - - - - Include/scripts/groovy - - - - - Include/scripts/groovy - - - Include/features - - - Include/config - - - - GENERIC - diff --git a/KatalonCucumberBDD/Libs/CustomKeywords.groovy b/KatalonCucumberBDD/Libs/CustomKeywords.groovy deleted file mode 100644 index c595a4f8a..000000000 --- a/KatalonCucumberBDD/Libs/CustomKeywords.groovy +++ /dev/null @@ -1,5 +0,0 @@ - -/** - * This class is generated automatically by Katalon Studio and should not be modified or deleted. - */ - diff --git a/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy b/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy deleted file mode 100644 index 0f60ebe2b..000000000 --- a/KatalonCucumberBDD/Libs/internal/GlobalVariable.groovy +++ /dev/null @@ -1,26 +0,0 @@ -package internal - -import com.kms.katalon.core.configuration.RunConfiguration -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase - -/** - * This class is generated automatically by Katalon Studio and should not be modified or deleted. - */ -public class GlobalVariable { - - - static { - def allVariables = [:] - allVariables.put('default', [:]) - - String profileName = RunConfiguration.getExecutionProfile() - - def selectedVariables = allVariables[profileName] - - } -} diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs deleted file mode 100644 index ec456a8cc..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_EnglishHindi_Save.rs +++ /dev/null @@ -1,80 +0,0 @@ - - - - input_EnglishHindi_Save - - ecd9d263-24cb-4f55-86e0-5f8b37295ddd - - - XPATH - //input[@name='Save'] - - - XPATH - false - - true - equals - tag - Main - input - - - true - equals - name - Main - Save - - - true - equals - type - Main - button - - - false - equals - value - Main - Save - - - false - equals - xpath - Main - id("details")/table[1]/tbody[1]/tr[7]/td[1]/input[1] - - - true - equals - xpath:attributes - //input[@name='Save'] - - - false - equals - xpath:idRelative - //form[@id='details']/table/tbody/tr[7]/td/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Languages Known'])[1]/following::input[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Click For'])[1]/preceding::input[1] - - - false - equals - xpath:position - //tr[7]/td/input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs deleted file mode 100644 index 4c0d2089d..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Initial_Initial.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input_Initial_Initial - - 4147d414-db74-43aa-93cf-b83588a4a5ac - - - XPATH - //input[@id='Initial'] - - - XPATH - false - - true - equals - tag - Main - input - - - true - equals - id - Main - Initial - - - true - equals - name - Main - Initial - - - true - equals - type - Main - text - - - false - equals - xpath - Main - id("Initial") - - - true - equals - xpath:attributes - //input[@id='Initial'] - - - false - equals - xpath:idRelative - //form[@id='details']/table/tbody/tr[2]/td[2]/span/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Initial'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[2]/preceding::input[1] - - - false - equals - xpath:position - //input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs deleted file mode 100644 index 1f21fdbfa..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Login.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input_Login_Login - - f6f35be9-c6a2-4e27-91ea-56d2eb891b0f - - - XPATH - //input[@name='Login'] - - - XPATH - false - - true - equals - tag - Main - input - - - true - equals - name - Main - Login - - - true - equals - type - Main - submit - - - false - equals - value - Main - Login - - - false - equals - xpath - Main - id("userName")/p[3]/input[1] - - - true - equals - xpath:attributes - //input[@name='Login'] - - - false - equals - xpath:idRelative - //form[@id='userName']/p[3]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[3]/input[1]')])[1]/preceding::input[1] - - - false - equals - xpath:position - //p[3]/input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs deleted file mode 100644 index 55092ed9f..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_Password.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input_Login_Password - - 8b324a72-4913-4c7a-b70a-82f50bd94358 - - - XPATH - //input[@name='Password'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - maxlength - Main - 10 - - - true - equals - name - Main - Password - - - true - equals - type - Main - text - - - false - equals - xpath - Main - id("userName")/p[2]/input[1] - - - true - equals - xpath:attributes - //input[@name='Password'] - - - false - equals - xpath:idRelative - //form[@id='userName']/p[2]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[1]/input[1]')])[1]/preceding::input[2] - - - false - equals - xpath:position - //p[2]/input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs deleted file mode 100644 index a0645ef4b..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input_Login_UserName.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input_Login_UserName - - ae864cbc-fb6c-426f-a41c-4fa206b8b905 - - - XPATH - //input[@name='UserName'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - maxlength - Main - 10 - - - true - equals - name - Main - UserName - - - true - equals - type - Main - text - - - false - equals - xpath - Main - id("userName")/p[1]/input[1] - - - true - equals - xpath:attributes - //input[@name='UserName'] - - - false - equals - xpath:idRelative - //form[@id='userName']/p/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Login'])[2]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Execute Automation Selenium Test Site'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'userName', '"', ')/p[1]/input[1]')])[1]/preceding::input[3] - - - false - equals - xpath:position - //input - - diff --git a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs b/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs deleted file mode 100644 index 5bb0a455f..000000000 --- a/KatalonCucumberBDD/Object Repository/Page_Execute Automation/input__FirstName.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - input__FirstName - - 96539eeb-add3-4a43-8e44-b9dcb7056248 - - - XPATH - //input[@id='FirstName'] - - - XPATH - false - - true - equals - tag - Main - input - - - true - equals - id - Main - FirstName - - - true - equals - name - Main - FirstName - - - true - equals - type - Main - text - - - false - equals - xpath - Main - id("FirstName") - - - true - equals - xpath:attributes - //input[@id='FirstName'] - - - false - equals - xpath:idRelative - //form[@id='details']/table/tbody/tr[3]/td[2]/span/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[2]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Middle Name'])[1]/preceding::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Gender'])[1]/preceding::input[2] - - - false - equals - xpath:position - //tr[3]/td[2]/span/input - - diff --git a/KatalonCucumberBDD/Profiles/default.glbl b/KatalonCucumberBDD/Profiles/default.glbl deleted file mode 100644 index de1027f04..000000000 --- a/KatalonCucumberBDD/Profiles/default.glbl +++ /dev/null @@ -1,7 +0,0 @@ - - - - default - - true - diff --git a/KatalonCucumberBDD/README.md b/KatalonCucumberBDD/README.md deleted file mode 100644 index 21e39b2ff..000000000 --- a/KatalonCucumberBDD/README.md +++ /dev/null @@ -1,9 +0,0 @@ -## Katalon with Cucumber BDD support - -Starting Katalon Studio 5.7, Cucumber API is supported as an part of Katalon studio out-of-box, meaning, you dont really have to add any cucumber library to Katalon studio as an external JAR reference, rather, its available within Katalon studio. - -## About this Repo -This repo contains the complete demostration of working with Cucumber BDD in Katalon Studio 5.7 - -## Video Demostration -Here is the complete video explaning how to get started with Cucumber in Katalon studio https://www.youtube.com/watch?v=vwCSfUhsivY diff --git a/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy b/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy deleted file mode 100644 index ce5e87e42..000000000 --- a/KatalonCucumberBDD/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy +++ /dev/null @@ -1,18 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.ea.steps.CucumberEARunner -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - -CucumberKW.runWithCucumberRunner(CucumberEARunner.class) diff --git a/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc b/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc deleted file mode 100644 index 5aea93271..000000000 --- a/KatalonCucumberBDD/Test Cases/ExecuteAutomation_TC1.tc +++ /dev/null @@ -1,8 +0,0 @@ - - - - ExecuteAutomation_TC1 - - - 9ccc1ff2-1a70-4f4b-ad95-dad93a1390b8 - diff --git a/KatalonCucumberBDD/Test Suites/TestSuite1.groovy b/KatalonCucumberBDD/Test Suites/TestSuite1.groovy deleted file mode 100644 index 49ab4777d..000000000 --- a/KatalonCucumberBDD/Test Suites/TestSuite1.groovy +++ /dev/null @@ -1,66 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject - -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile - -import internal.GlobalVariable as GlobalVariable - -import com.kms.katalon.core.annotation.SetUp -import com.kms.katalon.core.annotation.SetupTestCase -import com.kms.katalon.core.annotation.TearDown -import com.kms.katalon.core.annotation.TearDownTestCase - -/** - * Some methods below are samples for using SetUp/TearDown in a test suite. - */ - -/** - * Setup test suite environment. - */ -@SetUp(skipped = true) // Please change skipped to be false to activate this method. -def setUp() { - // Put your code here. -} - -/** - * Clean test suites environment. - */ -@TearDown(skipped = true) // Please change skipped to be false to activate this method. -def tearDown() { - // Put your code here. -} - -/** - * Run before each test case starts. - */ -@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. -def setupTestCase() { - // Put your code here. -} - -/** - * Run after each test case ends. - */ -@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. -def tearDownTestCase() { - // Put your code here. -} - -/** - * References: - * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ - */ \ No newline at end of file diff --git a/KatalonCucumberBDD/Test Suites/TestSuite1.ts b/KatalonCucumberBDD/Test Suites/TestSuite1.ts deleted file mode 100644 index 12a451e12..000000000 --- a/KatalonCucumberBDD/Test Suites/TestSuite1.ts +++ /dev/null @@ -1,20 +0,0 @@ - - - - TestSuite1 - - false - 2018-12-20T13:53:39 - - 0 - 30 - true - false - e8a1ffd6-0ef9-4ac4-9cad-c711a822a0a5 - - 2521c26f-59d1-446f-9fbe-59281ccceb99 - false - true - Test Cases/ExecuteAutomation_TC1 - - diff --git a/KatalonCucumberBDD/console.properties b/KatalonCucumberBDD/console.properties deleted file mode 100644 index 710966d84..000000000 --- a/KatalonCucumberBDD/console.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Sat Sep 08 18:41:21 NZST 2018 -deviceId= -kobitonDeviceId= -qTestDestId= -qTestDestType= -remoteWebDriverType=Selenium -remoteWebDriverUrl= diff --git a/KatalonCucumberBDD/runTests.bat b/KatalonCucumberBDD/runTests.bat deleted file mode 100644 index 41e1656d0..000000000 --- a/KatalonCucumberBDD/runTests.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -C:\Users\PaulR\Documents\Katalon_Studio_Windows_64-5.9.0\Katalon_Studio_Windows_64-5.9.0\katalon -noSplash -runMode=console -projectPath="C:\Users\PaulR\Documents\OCWA\OCWA\KatalonCucumberBDD\KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/KatalonCucumberBDD/runTests.sh b/KatalonCucumberBDD/runTests.sh deleted file mode 100644 index e88497f6a..000000000 --- a/KatalonCucumberBDD/runTests.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/KatalonCucumberBDD/KatalonCucumber.prj" -retry=0 -testSuitePath="Test Suites/TestSuite1" -executionProfile="default" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.composer.testcase.settings.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties deleted file mode 100644 index a50388cc6..000000000 --- a/KatalonCucumberBDD/settings/internal/com.kms.katalon.execution.webui.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Sat Sep 08 18:41:20 NZST 2018 -execution.default.selectingCapturedObjectSelectorMethod="XPATH" diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.analytics.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.jira.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties b/KatalonCucumberBDD/settings/internal/com.kms.katalon.integration.qtest.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/config/recent_projects b/config/recent_projects new file mode 100644 index 0000000000000000000000000000000000000000..f5a273b5ca102d8556d812db86bbd407af5b96ab GIT binary patch literal 2032 zcmb7F&udgy6h8AqOf|nqO2NuNN?RAHd2hxvp`)~*Gm|p-VuDFp3IVzE-ktHr_se_l zOWt%LSW3ZdX@wTL>`v&ui_+4CB8VsmF5I-smbmdB@Z5Xfm`q@FlEn)-=iGC@bH4Ap zxw8vL1c&J@vQ4Z+GT%DSIq5n~$n@sp(oc8EF9paop(xnbG>riuzf)9SJapQP0_$2J ztZPIPKME}xN+!Ej%%d&pN^8~pZs;hUQ9rpnjI6;#Oghwwh_}uH8YR+!;>Jd^E@8@1 zKy06c9eYi37Iw}#Fy4-Qk8&q+iDXfD9d1Cufr)^1IFZ!*f^xAJKFO(zI2vh8LXUdu zoKgdz=?MvwroS50Rx@Jv6Xw85Ov3}^>Y}0pVvVE;%^|_QodBA$x%%@fp!I<%v@J}=058o`WEv-Izn1`GL zQ|wiR&N3?WJlOcu>l*L1`{TdQW_M4GewPQpL!|+S%+-cm&8`E-J*1_^sUoL;<#i0< zLPk}=a^$f#qn<)_OdX=aa_v?!kuNgPKUg$WWS zvXWjhjuql*^sR&s=DkX#N~@K*`O5sl+{bRUI!8!rac;4E=FH+k+4EYoB4MF+c5_3Z zr#4qf;$PmZM|ck|Tx_n?zC3R}2X47gN9!J0u&P#B!`5oh&jgq``T}o$IQk6qc2In@ z`(x?-JmejiG+s2MDg&$W(4&*0Dn{^U= zYVeWy{rfxH|4#q*kG5DL;l2@szDL44&CvA|kJ?7b!tU@W+V1Y{pr8>HhC#4zo<0QA zFY3QGKmGaAp%Ca5yoX-w0c@i=6HY}hG2TnKdfN2HV2Ss3l-WbQR+;-@O1~6F;OYst z8etObPsS3Ce%`p$xZJGioAdgcsr=sUyMOh`{@(4Ue-0=6qLQZ3digL~|7ZxUC+v!( nLgGJ=0!4G>k2xuGdl?Pk-L81jh! literal 0 HcmV?d00001 diff --git a/ui-tests/.gitignore b/ui-tests/.gitignore deleted file mode 100644 index 36e75220d..000000000 --- a/ui-tests/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Katalon Studio -Reports/* -Profiles/default.glbl -.classpath -.settings diff --git a/ui-tests/.project b/ui-tests/.project deleted file mode 100644 index 55d9e666d..000000000 --- a/ui-tests/.project +++ /dev/null @@ -1,56 +0,0 @@ - - - OCWA - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.groovy.core.groovyNature - org.eclipse.jdt.core.javanature - - - - 1544033544591 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1544033544600 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 1544122890560 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1544122890586 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - diff --git a/ui-tests/Include/config/log.properties b/ui-tests/Include/config/log.properties deleted file mode 100644 index 8142b1dc2..000000000 --- a/ui-tests/Include/config/log.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file is used to configure Katalon Studio execution log levels. - -# When you need to troubleshoot Katalon Studio issue -# logging.level.com.kms=TRACE - -# logging.level.com.mycompany=DEBUG \ No newline at end of file diff --git a/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature b/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature deleted file mode 100644 index 263130bd7..000000000 --- a/ui-tests/Include/features/administator/export_discussion_status_approved_request.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: export discussion and status log of a request -As an administrator I need the ability to export a discussion / status log to a pdf file upon request approval so that I have a file-based log of the conversation independent of the database - - Scenario: generate an export log of a newly approved request - Given a request has a status of "Review in Progress" - When an output checker approves the request - Then a pdf file should be generates that chronologically lists the discussion about the request as well as status changes \ No newline at end of file diff --git a/ui-tests/Include/features/administator/manual_output_checking_component.feature b/ui-tests/Include/features/administator/manual_output_checking_component.feature deleted file mode 100644 index 62c5aa0c6..000000000 --- a/ui-tests/Include/features/administator/manual_output_checking_component.feature +++ /dev/null @@ -1,19 +0,0 @@ -Feature: Enable / Disable manual output checker component -As an administrator I need the ability to disable the manual output checker components so that stakeholders that do not have a manual output checking step in their export process can still utilize the application - - Scenario: Manual output checking component turned off and passes all policy tests - Given the manual output checking component has been marked as disabled - And the request passes all policy tests - When a request is submitted - Then the request status should be "Approved" - - Scenario: Manual output checking component turned off and fails a policy test - Given the manual output checking component has been marked as disabled - And the request fails at least one policy test - When a request is submitted - Then the request status should be "Work in progress" - - Scenario: Manual output checking component is turned on - Given the manual output checking component has been marked as enabled - When a request is submitted - Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui-tests/Include/features/administator/team_sharing_component.feature b/ui-tests/Include/features/administator/team_sharing_component.feature deleted file mode 100644 index 328d41da8..000000000 --- a/ui-tests/Include/features/administator/team_sharing_component.feature +++ /dev/null @@ -1,22 +0,0 @@ -Feature: team sharing of requests -As an administrator I need the ability to enable / disable the ability for requesters to view / edit their team member's request on a per project basis so that multiple types of project sharing models can be accommodated - - Scenario outline: Team sharing enabled - Given team sharing has been marked as enabled - And requester A is logged in - And requester B on the same project exists - And requester B has a request - When requester A views team's requests - Then requester B's request status should be visible - Example: - | status | - | Draft | - | Awaiting review | - | Review in progress | - | Approved | - | Work in progress | - | Archived | - Scenario: Team sharing disabled - Given team sharing has been marked as disabled - When a request is submitted - Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/adjudicate request.feature b/ui-tests/Include/features/output_checker/adjudicate request.feature deleted file mode 100644 index aa0da9e64..000000000 --- a/ui-tests/Include/features/output_checker/adjudicate request.feature +++ /dev/null @@ -1,17 +0,0 @@ -Feature: Adjudicate request -As an output checker I need the ability to change the status of a request to "Revisions required" so that I can allow the requester to tweak their request without having deny the request and forcing the requester to create a new request -As an output checker I need the ability to change the status of a request to "Approved" so that I can allow the requester to take their outputs out of the SRE - - Scenario: Request is worthy of approval - Given A request exists that is in "Review in Progress" - And the output checker is assigned to the request - When the output checker marks the request as approved - Then the output checker should see the status of the request updated to "Approved" - And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request - - Scenario: Request is needs revisions - Given A request exists that is in "Review in Progress" - And the output checker is assigned to the request - When the output checker marks the request as needs revisions - Then the output checker should see the status of the request updated to "Work in progress" - And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/claim_request.feature b/ui-tests/Include/features/output_checker/claim_request.feature deleted file mode 100644 index 371010dd3..000000000 --- a/ui-tests/Include/features/output_checker/claim_request.feature +++ /dev/null @@ -1,14 +0,0 @@ -Feature: Claim a request -As an output checker I need the ability to claim a request so that I can let my fellow output checker know that I'm going to be working on a particular request - -Scenario: Claim an unclaimed request -Given output checker has logged in -When output checker tries to claim an unclaimed request -Then the output checker should be able to see that they're now assigned the request - -Scenario: Claim a request already claimed by another output checker -Given output checker has logged in - And at least on other output checker exists - And the other output checker is assigned to a request -When output checker tries to claim the already assigned request -Then the output checker should be able to see that they're now assigned the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/undo_approval.feature b/ui-tests/Include/features/output_checker/undo_approval.feature deleted file mode 100644 index d82687a8f..000000000 --- a/ui-tests/Include/features/output_checker/undo_approval.feature +++ /dev/null @@ -1,9 +0,0 @@ -Feature: Undo request approval -As an output checker I need the ability to undo a request approval so that I can appropriately update requests to fix requests that were accidently approved or need to be made unavailable to an requester - -Scenario: Undo an approved request -Given output checker has logged in - And at least one approved request exists -When output checker submits an approved request to undo -Then the output checker should see that the request is now has a status of "Work in progress" -And the status of "Accepted" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature b/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature deleted file mode 100644 index 0300a9ed3..000000000 --- a/ui-tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature +++ /dev/null @@ -1,12 +0,0 @@ -Feature: See a list of all output checking requests -As an output checker I need the ability to see all requests so that I can quickly see what is in the queue - -Scenario Outline: View requests - Given output checker has logged in - When output checker selects a filter - Then the output checker should only see requests of type - Examples: - | filter | filter_condition | - | My requests | requests claimed by the output checker | - | Unassigned | requests not claimed by an output checker | - | All | all requests | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature b/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature deleted file mode 100644 index f4951feff..000000000 --- a/ui-tests/Include/features/requester/access_approved_output_files_outside_SRE.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: Access approved output files outside of the secure environment -As an requester I want to be able to access approved output files outside of the secure environment so that I can share my results with others - Scenario: Access approved request outside of the SRE - Given requester has logged in (outside of SRE) - And requester has an approved request - When requester views their request's approved files - Then requester can copy their approved files to their local computer \ No newline at end of file diff --git a/ui-tests/Include/features/requester/canceling_request.feature b/ui-tests/Include/features/requester/canceling_request.feature deleted file mode 100644 index a54c7dbbb..000000000 --- a/ui-tests/Include/features/requester/canceling_request.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: Canceling a request -As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed - Scenario: Cancel a request - Given requester has logged in - And requester has a request that is "Awaiting review" or "Review in progress" - When the requester cancels the request - Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui-tests/Include/features/requester/create_a_new_request.feature b/ui-tests/Include/features/requester/create_a_new_request.feature deleted file mode 100644 index a44ea1746..000000000 --- a/ui-tests/Include/features/requester/create_a_new_request.feature +++ /dev/null @@ -1,39 +0,0 @@ -Feature: create a new request - As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment - Background: - Given requester has logged in - And requester initiates a new request - And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of the authorized user�s knowledge - Scenario: A valid request - Given the export files do not violate any blocking rules - When requester submits their request - Then the requester's request is put in awaiting review - Scenario: A request has no data - Given requester does not provide any data they wish to export - When requester submits their request - Then the requester should not be able to submit the request - - Scenario Outline: A request violates blocking rule - Given a request violates blocking rule: - When requester submits their request - Then requester should not be able to submit the request - And the requester should be informed that has been violated - - Examples: - | blocking_rule | - | A request that has a file that is too big | - | The summation of all export file sizes exceeds the request file size limit | - | An export file has a blocked file extension | - | A request has a file with a StudyID in it | - - Scenario Outline: A request violates warning rule - Given a request violates blocking rule: - When requester submits their request - Then requester should be able to submit the request - And the requester should be informed that has been violated - - Examples: - | warning_rule | - | A request that has a file that exceeds the file size warning threshold | - | The summation of all export file sizes exceeds the request file size warning threshold | - | An export file has a warning file extension | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/draft_requests.feature b/ui-tests/Include/features/requester/draft_requests.feature deleted file mode 100644 index cbe142827..000000000 --- a/ui-tests/Include/features/requester/draft_requests.feature +++ /dev/null @@ -1,16 +0,0 @@ -Feature: Draft requests -As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once - Background: - Given requester has logged in - Scenario: Save a draft request (no files) - And requester has started a request - But has not submitted the request - When the requester saves their request - Then the requester should be able to re-open the request and pick up where they left off - - Scenario: Save a draft request (with files) - And requester has started a request - And requester add output files to the request - But has not submitted the request - When the requester saves their request - Then the requester should be able to re-open the request and pick up where they left off \ No newline at end of file diff --git a/ui-tests/Include/features/requester/edit_previously_submitted_request.feature b/ui-tests/Include/features/requester/edit_previously_submitted_request.feature deleted file mode 100644 index 05dcde51b..000000000 --- a/ui-tests/Include/features/requester/edit_previously_submitted_request.feature +++ /dev/null @@ -1,8 +0,0 @@ -Feature: edit a previously submitted request -As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request - Scenario: Edit a request that has been reviewed by an output checker and needs revisions - Given requester has logged in - And requester the request is "Work in Progress" - When the requester views the request - Then the requester should be able to make changes to the request - And re-submit the request \ No newline at end of file diff --git a/ui-tests/Include/features/requester/notifications.feature b/ui-tests/Include/features/requester/notifications.feature deleted file mode 100644 index 086673c6a..000000000 --- a/ui-tests/Include/features/requester/notifications.feature +++ /dev/null @@ -1,23 +0,0 @@ -Feature: Notifications -As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action - - Scenario Outline: requester notifications - Given an requester has created or modified a request - When occurs - Then the requester should receive an email notifying them of the - But the email should not contain specifics of the request - Examples: - | event | - | output checker makes a comment on the request | - | output checker approves the request | - | output checker requests revisions the request | - - Scenario Outline: output checker notifications - Given an output checker has currently claimed a request - When occurs - Then the output checker should receive an email notifying them of the - But the email should not contain specifics of the request - Examples: - | event | - | requester makes a comment on the request | - | requester re-submits a request | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/request_discussion.feature b/ui-tests/Include/features/requester/request_discussion.feature deleted file mode 100644 index f6aff55b7..000000000 --- a/ui-tests/Include/features/requester/request_discussion.feature +++ /dev/null @@ -1,15 +0,0 @@ -Feature: Discussion about a request - As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request - As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request - Scenario: requester adds a new comment about request - Given requester has logged in - And requester has a submitted request - And the request has been claimed by an output checker - When requester writes and submits a new comment - Then the requester should see their new comment displayed - And the output checker assigned to the request should be notified of the new comment - Scenario: Output checker adds a new comment about request - Given output checker has logged in - When output checker writes and submits a new comment - Then the output checker should see their new comment displayed - And the requester(s) associated to the request should be notified of the new comment \ No newline at end of file diff --git a/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature b/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature deleted file mode 100644 index 7e42638e3..000000000 --- a/ui-tests/Include/features/requester/see_edit_project_team_members_requests.feature +++ /dev/null @@ -1,15 +0,0 @@ -Feature: seeing / editing project team members requests -As an requester I need the ability to see / edit my team member's requests so that I can more easily collaborate with my fellow team members - Background: - Given requester has logged in - And the requester is a member of a project team - And another project team member has created a request - And the project has team sharing enabled - Scenario: View / edit a team member's request in a project that allows editing of team member's requests - Given the requester's project allows for editing of team member's requests - When the requester views their requests - Then the team member's request should be visible and editable - Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests - Given the requester's project does not allow for editing of team member's requests - When the requester views their requests - Then the team member's request should not be visible or editable \ No newline at end of file diff --git a/ui-tests/Include/features/requester/see_requests_by_status.feature b/ui-tests/Include/features/requester/see_requests_by_status.feature deleted file mode 100644 index 14c8c5bc5..000000000 --- a/ui-tests/Include/features/requester/see_requests_by_status.feature +++ /dev/null @@ -1,18 +0,0 @@ -Feature: See requester's requests by status -As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review - Scenario Outline: View requests - Given requester has logged in - And the requester has an request - And request was last updated within the last month - When requester views requests - Then requests should be displayed - But requests with updates older than a month should not be displayed - - Examples: - | status | filter | - | Approved | Approved | - | Revisions required | Draft | - | Awaiting review | Submitted | - | Review in progress | Submitted | - | Draft | Draft | - | Work in progress | Draft | \ No newline at end of file diff --git a/ui-tests/Include/features/requester/view_request_details.feature b/ui-tests/Include/features/requester/view_request_details.feature deleted file mode 100644 index d7ad2b06b..000000000 --- a/ui-tests/Include/features/requester/view_request_details.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: View request details -As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions - Scenario: View details of a request - Given requester has logged in - And the requester has submitted a request - When the requester views the request - Then the requester should see the complete record of the request (including export files, supporting files/text, discussion, and status changes) \ No newline at end of file diff --git a/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy b/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy deleted file mode 100644 index 4ae4db5f1..000000000 --- a/ui-tests/Include/scripts/groovy/MyCucumberRunner.groovy +++ /dev/null @@ -1,26 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.annotation.Keyword -import com.kms.katalon.core.checkpoint.Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling -import com.kms.katalon.core.testcase.TestCase -import com.kms.katalon.core.testdata.TestData -import com.kms.katalon.core.testobject.TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI - -import internal.GlobalVariable - -import org.junit.runner.RunWith -import cucumber.api.CucumberOptions -import cucumber.api.junit.Cucumber -import com.kms.katalon.core.cucumber.keyword.CucumberRunnerResult - -@RunWith(Cucumber.class) -@CucumberOptions(features = "Include/features/requester/draft_requests.feature", glue = "") -public class MyCucumberRunner {} \ No newline at end of file diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy deleted file mode 100644 index eeaf81f58..000000000 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_kr.groovy +++ /dev/null @@ -1,100 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as MobileBuiltInKeywords -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WSBuiltInKeywords -import com.kms.katalon.core.webui.driver.DriverFactory as DriverFactory -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - -import org.openqa.selenium.firefox.FirefoxDriver -import org.openqa.selenium.WebDriver -import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium - -import cucumber.api.java.en.Given -import cucumber.api.java.en.Then -import cucumber.api.java.en.When - -import static org.junit.Assert.* -import java.util.regex.Pattern -import static org.apache.commons.lang3.StringUtils.join - - - -public class Requester_step_def_kr { - - WebDriverBackedSelenium selenium - String request_name - - @Given("yrequester has logged in") - def requester_login() { - - WebUI.openBrowser('') - def driver = DriverFactory.getWebDriver() - String baseUrl = GlobalVariable.OCWA_URL - selenium = new WebDriverBackedSelenium(driver, baseUrl) - selenium.open(GlobalVariable.OCWA_URL) - selenium.click("id=app-auth-login-button") - selenium.type("id=username", "xxx") - selenium.type("id=password", "xxx") - selenium.click("id=kc-login") - } - - @Given("yrequester has started a request") - def requester_starts_new_request() { - WebUI.waitForPageLoad(0) - selenium.click("id=new-request-button") - - request_name = randomString() - selenium.type("id=name", request_name) - } - - @Given("ythe requester has submitted a request") - def requester_submits_a_request() { - requester_starts_new_request() - //requester saves and add files - //requester adds output files - //requester adds supporting files - //requester add supporting text - //requester submits request for review - } - - @Given("yrequester add output files to the request") - def requester_adds_output_files() { - // selenium.click("id=request-form-save-files-button") - // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") - } - - - @Given("yhas not submitted the request") - def requester_has_not_submitted_new_request() { - } - - @When("ythe requester saves their request") - def requester_saves_new_request() { - selenium.click("id=request-form-save-close-button") - } - - @Then("ythe requester should be able to re-open the request and pick up where they left off") - def confirm_draft_save_was_successful() { - WebUI.waitForPageLoad(0) - WebUI.verifyTextPresent(request_name, false) - } - - def randomString() { - Date today = new Date() - String todaysDate = today.format('MMddyy-hhmm') - String engagementName = 'auto_eng ' + todaysDate - return engagementName - } -} diff --git a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy deleted file mode 100644 index 5f5053221..000000000 --- a/ui-tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ /dev/null @@ -1,156 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.annotation.Keyword -import com.kms.katalon.core.checkpoint.Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords -import com.kms.katalon.core.model.FailureHandling -import com.kms.katalon.core.testcase.TestCase -import com.kms.katalon.core.testcase.TestCaseFactory -import com.kms.katalon.core.testdata.TestData -import com.kms.katalon.core.testdata.TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository -import com.kms.katalon.core.testobject.TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords - -import internal.GlobalVariable - -import MobileBuiltInKeywords as Mobile -import WSBuiltInKeywords as WS -import WebUiBuiltInKeywords as WebUI - -import org.openqa.selenium.WebElement -import org.openqa.selenium.WebDriver -import org.openqa.selenium.By - -import com.kms.katalon.core.mobile.keyword.internal.MobileDriverFactory -import com.kms.katalon.core.webui.driver.DriverFactory - -import com.kms.katalon.core.testobject.RequestObject -import com.kms.katalon.core.testobject.ResponseObject -import com.kms.katalon.core.testobject.ConditionType -import com.kms.katalon.core.testobject.TestObjectProperty - -import com.kms.katalon.core.mobile.helper.MobileElementCommonHelper -import com.kms.katalon.core.util.KeywordUtil - -import com.kms.katalon.core.webui.exception.WebElementNotFoundException - -import cucumber.api.java.en.And -import cucumber.api.java.en.Given -import cucumber.api.java.en.Then -import cucumber.api.java.en.When - - -class Requester_step_def_ks { - String request_name = '' - TestObject newRequestButtonObject = null - TestObject requestFormSaveCloseButtonObject = null - - /** - * The step definitions below match with Katalon sample Gherkin steps - */ - @Given("requester has logged in") - def requester_login() { - WebUI.openBrowser('') - WebUI.delay(5) - WebUI.closeBrowser() - - //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) - - //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - - //WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - - //WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) - } - - @Given("requester has started a request") - def requester_starts_new_request() { - - //newRequestButtonObject = new TestObject("new-request-button") - //newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - - //WebUI.waitForPageLoad(30) - - //WebUI.waitForElementClickable(newRequestButtonObject, 30) - //WebUI.click(newRequestButtonObject) - //request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() - //WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) - } - - @Given("has not submitted the request") - def requester_has_not_submitted_new_request() { - } - - @Given("requester add output files to the request") - def requester_adds_output_files() { - // selenium.click("id=request-form-save-files-button") - // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") - } - - @Given("the output files do not violate any blocking rules") - def output_files_do_not_violate_blocking_rules(){} - - @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") - def requester_affirms_output_is_safe() { - } - - @Given("requester has a submitted request") - def request_has_submitted_a_request(){ - requester_starts_new_request() - requester_adds_output_files() - requester_submits_request() - } - - @Given("the request has been claimed by an output checker") - def request_has_been_claimed_by_a_oc(){} - - @When("the requester saves their request") - def requester_saves_new_request() { - //requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - //requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - //WebUI.click(requestFormSaveCloseButtonObject) - } - - @When("requester submits their request") - def requester_submits_request() { - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) - } - - @When("requester writes and submits a new comment") - def requester_creates_a_new_comment(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Smcuk')) - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) - - //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) - - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') - } - - @Then("the requester should be able to re-open the request and pick up where they left off") - def confirm_draft_save_was_successful() { - //WebUI.waitForPageLoad(0) - //WebUI.verifyTextPresent(request_name, false) - } - - @Then("the requester's request is put in awaiting review") - def confirm_request_is_in_awaiting_review_state(){ - WebUI.verifyTextPresent("Awaiting review", false) - } - - @Then("the requester should not be able to submit the request") - def requester_is_not_able_to_submit_request(){ - WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) - } -} \ No newline at end of file diff --git a/ui-tests/LICENSE b/ui-tests/LICENSE deleted file mode 100644 index 261eeb9e9..000000000 --- a/ui-tests/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/ui-tests/Libs/CustomKeywords.groovy b/ui-tests/Libs/CustomKeywords.groovy deleted file mode 100644 index 9457decb7..000000000 --- a/ui-tests/Libs/CustomKeywords.groovy +++ /dev/null @@ -1,9 +0,0 @@ - -/** - * This class is generated automatically by Katalon Studio and should not be modified or deleted. - */ - - -def static "test_OCWA_keywords.random_test_request_name.gen_random_test_request_name"() { - (new test_OCWA_keywords.random_test_request_name()).gen_random_test_request_name() -} diff --git a/ui-tests/Libs/internal/GlobalVariable.groovy b/ui-tests/Libs/internal/GlobalVariable.groovy deleted file mode 100644 index 51b9af8e5..000000000 --- a/ui-tests/Libs/internal/GlobalVariable.groovy +++ /dev/null @@ -1,33 +0,0 @@ -package internal - -import com.kms.katalon.core.configuration.RunConfiguration -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase - -/** - * This class is generated automatically by Katalon Studio and should not be modified or deleted. - */ -public class GlobalVariable { - - /** - *

- */ - public static Object OCWA_URL - - - static { - def allVariables = [:] - allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca']) - allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) - - String profileName = RunConfiguration.getExecutionProfile() - - def selectedVariables = allVariables[profileName] - OCWA_URL = selectedVariables['OCWA_URL'] - - } -} diff --git a/ui-tests/OCWA.prj b/ui-tests/OCWA.prj deleted file mode 100644 index b72b1c47e..000000000 --- a/ui-tests/OCWA.prj +++ /dev/null @@ -1,28 +0,0 @@ - - - - OCWA - - c5e0fe7e-c962-4704-a11f-3f2a0dde36b0 - 5.9.0 - 0 - - - - Include/scripts/groovy - - - - - Include/scripts/groovy - - - Include/features - - - Include/config - - - - GENERIC - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs b/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs deleted file mode 100644 index d8b91480a..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/a_OCWA Export Tool.rs +++ /dev/null @@ -1,86 +0,0 @@ - - - - a_OCWA Export Tool - - 25096df1-9278-4593-ba26-96d3644e62fb - - - XPATH - //div[@id='main']/div/div/main/div/a - - - XPATH - false - - true - equals - tag - Main - a - - - false - equals - class - Main - src-components-app-bar-styles_brand--2yq_z3-4 - - - true - equals - href - Main - / - - - true - equals - text - Main - OCWA Export Tool - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-components-app-bar-styles_container--1ufsCzTM"]/a[@class="src-components-app-bar-styles_brand--2yq_z3-4"] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div/a - - - false - equals - xpath:link - //a[contains(text(),'OCWA Export Tool')] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/preceding::a[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='gfggggg'])[1]/preceding::a[1] - - - false - equals - xpath:href - //a[contains(@href, '/')] - - - false - equals - xpath:position - //a - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs b/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs deleted file mode 100644 index e3e500cf5..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/button_All.rs +++ /dev/null @@ -1,97 +0,0 @@ - - - - button_All - - 57c6c6d1-9295-45c9-a94f-4e2707f2030b - - - XPATH - (//button[@type='button'])[2] - - - BASIC - //button[@type = 'button' and (text() = 'All' or . = 'All')] - - - BASIC - false - - true - equals - tag - Main - button - - - false - equals - class - Main - sc-ifAKCX eiXwJb - - - false - equals - spacing - Main - default - - - true - equals - type - Main - button - - - true - equals - text - Main - All - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"] - - - true - equals - xpath:attributes - (//button[@type='button'])[2] - - - false - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::button[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::button[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::button[1] - - - false - equals - xpath:position - //nav/div/div/button - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs deleted file mode 100644 index 7fdfa747c..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/div_My RequestsAllDraftQueuedI.rs +++ /dev/null @@ -1,67 +0,0 @@ - - - - div_My RequestsAllDraftQueuedI - - 0fbd49b5-aff6-4db6-a4fe-1ca40e30216a - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2] - - - XPATH - false - - true - equals - tag - Main - div - - - false - equals - class - Main - sc-jTzLTM gBDbcZ - - - true - equals - text - Main - My RequestsAllDraftQueued/In ReviewFlaggedDeniedCancelledStatusRequest IdentifierSubmitted OnUpdated OnOutput CheckergfgggggDec 5th, 2018Dec 5th, 2018-Actions - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::div[17] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::div[18] - - - false - equals - xpath:position - //div[2]/div/div/div[2] - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs deleted file mode 100644 index ba14bcb03..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/div_Request Name_Content-ve26f.rs +++ /dev/null @@ -1,66 +0,0 @@ - - - - div_Request Name_Content-ve26f - - 7c1d1122-bf34-4010-91ca-3e08c1ecd1b7 - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::div[3] - - - XPATH - false - - true - equals - tag - Main - div - - - false - equals - class - Main - Content-ve26fj-1 kmGRCO - - - true - equals - xpath - Main - /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-clBsIJ daqMjj"]/div[@class="Form__FormWrapper-sc-11btfyj-0 fTWjSn"]/form[1]/div[@class="Field__FieldWrapper-vqybw1-0 doxtck"]/div[@class="FieldTextStateless__Wrapper-ynbdsh-0 gIJAym"]/div[@class="Content__ContentWrapper-ve26fj-2 feWTNh"]/div[@class="Content__ChildWrapper-ve26fj-0 ilJUcG"]/div[@class="Content-ve26fj-1 kmGRCO"] - - - true - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::div[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::div[5] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='This field is required'])[1]/preceding::div[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::div[2] - - - false - equals - xpath:position - //form/div/div/div/div/div - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs b/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs deleted file mode 100644 index 66899c38a..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/div_You have no requests.rs +++ /dev/null @@ -1,73 +0,0 @@ - - - - div_You have no requests - - b89ed3fb-0198-49dd-8259-f0813e8d1488 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div[2] - - - XPATH - false - - true - equals - tag - Main - div - - - false - equals - class - Main - LoadingContainer__Container-kdx72l-0 cnWOuY - - - true - equals - text - Main - You have no requests! - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainer__Container-kdx72l-0 cnWOuY"] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Output Checker'])[1]/following::div[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Updated On'])[1]/following::div[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Flag notifications'])[1]/preceding::div[7] - - - false - equals - xpath:position - //div[2]/div/div/div/div/div[2] - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs b/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs deleted file mode 100644 index d8959732d..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/h1_gfggggg.rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - h1_gfggggg - - a1fc170f-0b98-4d7d-b215-a30c8ce55c48 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/h1 - - - XPATH - false - - true - equals - tag - Main - h1 - - - true - equals - text - Main - gfggggg - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-request-styles_header--3R28zHQp"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG bLOLTU"]/div[1]/h1[1] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/h1 - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::h1[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::h1[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::h1[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Details'])[1]/preceding::h1[1] - - - false - equals - xpath:position - //h1 - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs deleted file mode 100644 index f57f705e9..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_All.rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - span_All - - e46b1338-cfb4-4490-afcb-c261879f15a8 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button/span/span - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - All - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX kcQtWv"]/span[1]/span[1] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div/button/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='New Request'])[1]/following::span[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[3] - - - false - equals - xpath:position - //nav/div/div/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs deleted file mode 100644 index 68d4bcaab..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel (1).rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - span_Cancel (1) - - 302d13ea-63d3-429f-8017-1c0869660067 - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Cancel - - - false - equals - xpath - Main - id("request-form-cancel-button")/span[1]/span[1] - - - true - equals - xpath:idRelative - //button[@id='request-form-cancel-button']/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div/div/div[3]/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs deleted file mode 100644 index 5cd570307..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Cancel.rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - span_Cancel - - d24922ab-3227-4de2-a025-9b61de62c54f - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Cancel - - - false - equals - xpath - Main - id("request-form-cancel-button")/span[1]/span[1] - - - true - equals - xpath:idRelative - //button[@id='request-form-cancel-button']/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div/div/div[3]/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs deleted file mode 100644 index 35d936862..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Draft.rs +++ /dev/null @@ -1,72 +0,0 @@ - - - - span_Draft - - 5e1ee825-c4ed-4fe3-aad4-e969480d9cb0 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div[2]/button/span/span - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Draft - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-requests-list-styles_header--1ErTpvDv"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/nav[@class="src-modules-requests-components-requests-list-styles_filters--2zXt4B4j"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/header/div/div/div/nav/div/div[2]/button/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/following::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div[2]/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs deleted file mode 100644 index f04ad3bb2..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login (1).rs +++ /dev/null @@ -1,54 +0,0 @@ - - - - span_Login (1) - - 736cb464-f5e1-49ac-b997-9d69349bde84 - - - XPATH - //span/span - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Login - - - false - equals - xpath - Main - id("app-auth-login-button")/span[1]/span[1] - - - true - equals - xpath:idRelative - //a[@id='app-auth-login-button']/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] - - - false - equals - xpath:position - //span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs deleted file mode 100644 index 512ee9e88..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request.rs +++ /dev/null @@ -1,83 +0,0 @@ - - - - span_New Request - - 67319848-cfcb-40e6-8718-6ed1d88c2501 - - - XPATH - //div[@id='main']/div/div/main/div/div/button/span/span[2] - - - BASIC - id("new-request-button")/span[1]/span[2][count(. | //span[(text() = 'New Request' or . = 'New Request') and @id = 'new-request-button']) = count(//span[(text() = 'New Request' or . = 'New Request') and @id = 'new-request-button'])] - - - BASIC - false - - true - equals - tag - Main - span - - - true - equals - text - Main - New Request - - - true - equals - xpath - Main - id("new-request-button")/span[1]/span[2] - - - true - equals - id - Main - new-request-button - - - true - equals - xpath:idRelative - //button[@id='new-request-button']/span/span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] - - - false - equals - xpath:position - //span[2] - - - false - equals - xpath:idRelative - //div[@id='main']/div/div/main/div/div/button/span/span[2] - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs deleted file mode 100644 index c0e3b9127..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close (1).rs +++ /dev/null @@ -1,74 +0,0 @@ - - - - span_Save Close (1) - - fcb168c3-906b-48cc-8c0d-63697e3b1f15 - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] - - - BASIC - //span[(text() = 'Save & Close' or . = 'Save & Close')] - - - CSS - - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Save & Close - - - false - equals - xpath - Main - /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-eMRERa dFsmTH sc-fgrSAo gdmBOU"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] - - - true - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[5] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div[2]/div/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs b/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs deleted file mode 100644 index 5953f01aa..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Save Close.rs +++ /dev/null @@ -1,70 +0,0 @@ - - - - span_Save Close - - 571126cb-8d91-45cd-a433-0545e72d0e97 - - - XPATH - (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] - - - BASIC - //span[(text() = 'Save & Close' or . = 'Save & Close')] - - - BASIC - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Save & Close - - - false - equals - xpath - Main - /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-jotlie juROSR"]/div[3]/div[@class="sc-fdQOMr jVajGW"]/div[@class="sc-cNnxps gIdQgO"]/div[@class="sc-dwztqd cXeerP"]/div[@class="sc-eMRERa dFsmTH sc-fgrSAo gdmBOU"]/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] - - - true - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Confidentiality'])[2]/following::span[5] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save & Add Files'])[1]/preceding::span[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/preceding::span[3] - - - false - equals - xpath:position - //div[2]/div/button/span/span - - diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs b/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs deleted file mode 100644 index 758eef0e2..000000000 --- a/ui-tests/Object Repository/Page_OCWA Development Version/table_StatusRequest Identifier.rs +++ /dev/null @@ -1,67 +0,0 @@ - - - - table_StatusRequest Identifier - - 66325af3-ebf7-4813-ae5d-9f1d250d8835 - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table - - - XPATH - false - - true - equals - tag - Main - table - - - false - equals - class - Main - DynamicTable__Table-sc-1naczgt-0 cFUPVR - - - true - equals - text - Main - StatusRequest IdentifierSubmitted OnUpdated OnOutput CheckergfgggggDec 5th, 2018Dec 5th, 2018-Actions - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainerAdvanced__Container-sc-1s2zdt8-0 cFyKDm"]/table[@class="DynamicTable__Table-sc-1naczgt-0 cFUPVR"] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Cancelled'])[1]/following::table[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/following::table[1] - - - false - equals - xpath:position - //table - - diff --git a/ui-tests/Profiles/Travis.glbl b/ui-tests/Profiles/Travis.glbl deleted file mode 100644 index feb3f8808..000000000 --- a/ui-tests/Profiles/Travis.glbl +++ /dev/null @@ -1,12 +0,0 @@ - - - - Travis - - false - - - 'http://localhost:8000' - OCWA_URL - - diff --git a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy b/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy deleted file mode 100644 index 9abd4b88e..000000000 --- a/ui-tests/Scripts/Requester/Run cucumber tests/Script1544053608217.groovy +++ /dev/null @@ -1,28 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - - - -//cucumberRunnerClass c = new MyCucumberRunner() - -//CucumberRunnerResult c1 = -CucumberKW.runWithCucumberRunner(MyCucumberRunner.class) - - -//CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') -//CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature', FailureHandling.STOP_ON_FAILURE) -//CucumberRunnerResult c1 = CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') -//CucumberKW.runFeatureFolder('Include/features/requester') -//println "Status" + c1.getStatus().toString() \ No newline at end of file diff --git a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy b/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy deleted file mode 100644 index 33d71f778..000000000 --- a/ui-tests/Scripts/Requester/test_case_testing/Script1544808549240.groovy +++ /dev/null @@ -1,23 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - -WebUI.openBrowser('http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca/') - -//WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - -WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) - -WebUI.closeBrowser() - diff --git a/ui-tests/Test Cases/Requester/Run cucumber tests.tc b/ui-tests/Test Cases/Requester/Run cucumber tests.tc deleted file mode 100644 index 800064d70..000000000 --- a/ui-tests/Test Cases/Requester/Run cucumber tests.tc +++ /dev/null @@ -1,8 +0,0 @@ - - - - Run cucumber tests - - - 76fac551-a5e8-47b3-ad4d-73ca4acc6659 - diff --git a/ui-tests/Test Cases/Requester/test_case_testing.tc b/ui-tests/Test Cases/Requester/test_case_testing.tc deleted file mode 100644 index a2198ee2c..000000000 --- a/ui-tests/Test Cases/Requester/test_case_testing.tc +++ /dev/null @@ -1,8 +0,0 @@ - - - - test_case_testing - - - 2e88f452-f251-4bbb-b9a2-876eb3eecea1 - diff --git a/ui-tests/Test Suites/Run OCWA test cases.groovy b/ui-tests/Test Suites/Run OCWA test cases.groovy deleted file mode 100644 index 49ab4777d..000000000 --- a/ui-tests/Test Suites/Run OCWA test cases.groovy +++ /dev/null @@ -1,66 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject - -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile - -import internal.GlobalVariable as GlobalVariable - -import com.kms.katalon.core.annotation.SetUp -import com.kms.katalon.core.annotation.SetupTestCase -import com.kms.katalon.core.annotation.TearDown -import com.kms.katalon.core.annotation.TearDownTestCase - -/** - * Some methods below are samples for using SetUp/TearDown in a test suite. - */ - -/** - * Setup test suite environment. - */ -@SetUp(skipped = true) // Please change skipped to be false to activate this method. -def setUp() { - // Put your code here. -} - -/** - * Clean test suites environment. - */ -@TearDown(skipped = true) // Please change skipped to be false to activate this method. -def tearDown() { - // Put your code here. -} - -/** - * Run before each test case starts. - */ -@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. -def setupTestCase() { - // Put your code here. -} - -/** - * Run after each test case ends. - */ -@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. -def tearDownTestCase() { - // Put your code here. -} - -/** - * References: - * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ - */ \ No newline at end of file diff --git a/ui-tests/Test Suites/Run OCWA test cases.ts b/ui-tests/Test Suites/Run OCWA test cases.ts deleted file mode 100644 index 41a580f83..000000000 --- a/ui-tests/Test Suites/Run OCWA test cases.ts +++ /dev/null @@ -1,20 +0,0 @@ - - - - Run OCWA test cases - - false - 2018-12-11T13:49:04 - - 0 - 30 - true - false - b535506e-7ead-48e8-b30a-3efef1a51e0f - - 09de8a8b-040a-4a5d-a823-53625b8804a5 - false - true - Test Cases/Requester/Run cucumber tests - - diff --git a/ui-tests/Test Suites/TestingTestSuite.groovy b/ui-tests/Test Suites/TestingTestSuite.groovy deleted file mode 100644 index 49ab4777d..000000000 --- a/ui-tests/Test Suites/TestingTestSuite.groovy +++ /dev/null @@ -1,66 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject - -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile - -import internal.GlobalVariable as GlobalVariable - -import com.kms.katalon.core.annotation.SetUp -import com.kms.katalon.core.annotation.SetupTestCase -import com.kms.katalon.core.annotation.TearDown -import com.kms.katalon.core.annotation.TearDownTestCase - -/** - * Some methods below are samples for using SetUp/TearDown in a test suite. - */ - -/** - * Setup test suite environment. - */ -@SetUp(skipped = true) // Please change skipped to be false to activate this method. -def setUp() { - // Put your code here. -} - -/** - * Clean test suites environment. - */ -@TearDown(skipped = true) // Please change skipped to be false to activate this method. -def tearDown() { - // Put your code here. -} - -/** - * Run before each test case starts. - */ -@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. -def setupTestCase() { - // Put your code here. -} - -/** - * Run after each test case ends. - */ -@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. -def tearDownTestCase() { - // Put your code here. -} - -/** - * References: - * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ - */ \ No newline at end of file diff --git a/ui-tests/Test Suites/TestingTestSuite.ts b/ui-tests/Test Suites/TestingTestSuite.ts deleted file mode 100644 index cfaf2f9db..000000000 --- a/ui-tests/Test Suites/TestingTestSuite.ts +++ /dev/null @@ -1,20 +0,0 @@ - - - - TestingTestSuite - - false - 2018-12-14T09:32:19 - - 0 - 30 - true - false - 37beaa13-ec79-424e-aaa5-703cc753aa44 - - c0b18a0a-46ce-4d12-a377-bd30fe71c1b1 - false - true - Test Cases/Requester/test_case_testing - - diff --git a/ui-tests/bin/groovy/Requester_step_def_kr.class b/ui-tests/bin/groovy/Requester_step_def_kr.class deleted file mode 100644 index a2f422bbd2e87f2019711b1a50b0e033bc47c755..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6547 zcmbtY349dQ8UJ3g$!<0SBm)E@sH>(DHd$9zt4KtFC=f}2l7tAfT_?M<*&(|#ab`AQ zd#JV8YOSqpZEbDU)~eLjwup#{SLvnJUiPr}ec$(e*#5tn+0AUSLH$8~yq)>pcVF*& z^VG8sJw`;U#EF6y?@%u6;J9)UKJ$wPHWq5o0>iXoTfI*R%|WRol`8U zN6#37qP>PW5>FXvHLDb?xMz&1W^yo4GxT^F7xcko5*+%v1&Q5)8uF^GINO4j^!nY< zSK0tg{rQ@%*%t_^ZC|-lBAFJ3DL{(^HMfnZcDItt^=r1e-ZYh>phWx1J=GN|=(d(u z<0;@k**yCiC%C1I+erGgeR%YMhivI>G)+gHw^okS^C09VK zmKMtlBU#0Yfa!>uj%a!h4slwqoz6a_6lsuqzfX-R4{tdO$&u8STQsLBCKU9tz73qrpyhq#hK*2)h^uP0;B&+cJV$+I#%o z^N`R{4H^rRPM0&IMx2T812l+v?8|<#C7MqQ*uCR|&Nx=UOQB{FW=2V=tAn%;ojI*p zT$E|_Y(1@*X)O;xucvc00O`w!phX>lc8#p(GP ziNe&#dcT&>O^7z~Zly_d4V}gZ!s}SzJUEL@cfx<2pk=&kgk1y?1VwvtA{9xK?%jFwYz3PpXv#&*QrjX1jz+lcsN3R*F( zAkLAbZrI7P29-HD&y*m6kJyQU>nLh=h~?=JYg{dX0Mqg|FC-( z2s#DsEoD{4F!M1+jiqvirIxeooj^+&dPXzz$+W3tU=xs%6EM&!q*AJ7WeO;oIaC^O zRT`M766UO2Ix?(AIRDs@rW(Uxp!>ZLL1sk8wA5&%Fcz7}swNP#YB7>iGj_ztWY~x% zUYaY4ZG&OtR7DTc?ObBJ{UzpYIVJYKFuj-VU~*Z|e5Y0mww8-uq}Vv6?vkj-J(CVF z%0lFRUtc<1EXK0gd_F`UWGJSn2J|l@sp=z<5PcXUg>9sHkZN)pc9|ijjj*$2F?+}Z zg)*Y%QAb;yc`?Mp7>|XRqAG?Nx64X&KON@5?Eyjac%buDYDbkeJ@>@*AWd>>o{~tS zd0c}J3u>?0JF3i}L3$JwTT<1XVAuM^m(GOe%Mg+H7#$7MWAt&CaoH}3KFPD;WArI( zSgPOP6Ds>onWSswPT*?#xG|~%m^IQf#wYKve_n?vcOi&gTy?Gv(r2IZ-)?8=_y}9=xr4Xnk^UM{kIJ1?|soL&LYc5w-1t5d8+%5#|!2 z-=W8)a_Gq+`U79pFerxTPoSAlG<&0AZbw(^H580te+khwA=-=9jO((NDGsRnkXx#S zmKUObU>f5CN5S*Iz-KI1utM}7+~lg6C+Hj`L)D%#*A>dS&~|Z?UM$g1=%*-Wfjdy* zg)<2X4E`0R;5NCc-o^!6)P+Sr)Jyau`Z4;ez!!(xAYoSc}AxgoK$yG>Ul= zJxl*%g>gbxo)apZS7s?qZQx+yGr$5P)u61b8qukdCFh+5n%; z2yL&Xt6QCGv+9&>R#8p?8gAU&Qgk zA(=q4JWEPRuot4M=iYsCq`JsqA7P!#^_0A?q=7o$O3nskcO6?7)uNUP`$N{D5^ zZG@NF@c%^?$OO;DuEQ{J1n@^xbRCw1!)hnVESX`sDi+-LLo{&(Mqt;%RBP8EgmYl#FOAfJQF`IF{k8wS41JpB<;adQH>v1sLK9k|w!0@Ir z!*wu+HEeOCeX|>mcg;#bHx!Fz={s0v|90?2GQ9&ox0Kmm3X_<9)MbC`jAXhE?;Lp~ z*!$;*e!EX3&t?JIjp*+wi+#5%_C5H)9nxzXx5Fwf`Yo>5I}`HVQ}lrvlJ9oP_im@$ z?@4sZA94)!)%(2(`6DQIvz`>#DF7!$CNQRUM9;YWf0@;&T zAMF4RcTr~eBz?x)Z-u_xb>~6$Q_+sjDf(gnCc0=()0aH7rC#nxF4`1*wYH4)41H}* zX5S3JPyA2Nx9Hm*S~K3*h&re|;K;)3cj&v`c7@6VCGzjl_p6ZaFOmO%eprosziV-r z=L2v5dYHn}uZ+qogv;)b> ze+9&Hp0AMqhUaUY-5cb;eyf9XoBU5e?sPccBmW!E_sak6FDZsOz*Fp0gn|`o z!A diff --git a/ui-tests/bin/groovy/Requester_step_def_ks.class b/ui-tests/bin/groovy/Requester_step_def_ks.class deleted file mode 100644 index 86527bfc8ec96fe1b2b1fec6a80f26e53fab5d8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6842 zcmbtZd0-UP8UJ3g$u7wPVIV*daVb9kJJ@`~ivxj2Htrpqm*t9dC%Nlddy+NP!tZx*yzm*XCluA*%lx=UWr+CnAc%srQcy!$wd_8lZ=wJnpB?o%*>jF>$FbMuR^N^X6Q)(Px`CcU&ka)pHL?b4 z!W4GDS_Lg+b0r=3mCY-tCE8lW@?mPDwQQI6FfAa3>BR*F>=DgkcU6pAxNE)_MaYkw zF|6r=7Jc_Lj*7xP2XjH?AL?m$RAzFixWI_T7msktJ|v7}5dGNM`$&>WVT zh^E&fAqm#1=%H~rRMg_5a$?*tGw}gA)US0FwVb^}?{W8#u;&PBKc2g0MM{t$R)Dt! zZ9Kk{JS8jW9i}aGUL&1L=d%KWml`Ok>4*hg&BeFpj3G6*S2ZJhZb-Hl9d$M>ki zGPS#VpfhrT9FsYtke9k0*(*(p)7~nmdMd#Y5TczXCUg`y1P(?H_N1Q}#BVwe-)wre?igv2sVms$$#4sZ=uWGqe(b)-6Kgv@98Jd$5 zAsP^LQ3WHHTI4CMY>Xu{y&Dm?4X#v2CSDc@n%7-K&(BX6 zzgI9Xr#8G2k#f8;Xv3f*s-DSV*oY@b4AW*4U+C=w=~akAw|%(-$%(6zH@Jl9HT2pB zdNsXn#^mIl2I&nfy28ssLEEdOO4aJ)CVQ_tJVkaP;hhO8L~j(drX0B`bd;2C*eR=9Xta6zX`Q&KY-D`gaIt}$6HC($EY%cl{XM%=@QbI3)h z8YK&(*D<+vO668LFyeH|l|D++j5zpAT{BCPvK1EzTHy)Qp2dXM&T#E%p7F|g`7Q=* z=4CN2O9ZV<8+ukV^QnxfW??7bq{d-1tC&tp%gPqf3#&-i=Sr76M!FHBn9D?lWQ6-0 z+rgCW=xeCc)0T}Ox*`QFJsK$%BI6^{1mK9Ah~#9}ju_c23%8UPjBFtu0(l(8gfnB% zaQjM_-b?rJ!1z8vb9s>T%|2}v(!2UJ^a1)HPgfrb(_EUz)6hXd(TbT>I( zRCjXT;%8qP>z*w^Wcz(|e*+z+BQD{xUSXQ#x$Q7b;lPr9g_lLE%zCYR0jud_#;63H z5d-Ca#)RXg?6az3JTiiHbH#Z+NJmfDSx<&pm>#B&H`2%G6M`CH-YPSaN77$4y_$QB zqTa4g(dwvSdXye#-k$<*79^B{rTkvanbdB}h+8%>Rp5r%kEavfGcA+Q3cuG9RkXl8s#5 zx=dpnb7qLXi!!9EW7;ri^cnqTE=1o)5#vUd>hDd2=!dxaq;sf!A^I^IcUIFg)3yxJ zPcgzkvp#vH9ipG3bK=KVJ#9|lG6_K5{U!W-?rIcn%bTrMpBJKEBSz7MN--Lu-{NMy z_2T}{L^4Fb2gbOn*)S9j^$A18?Da=nOT5jkImxqqH;ct(J4AmLbRl0EocTZHU9_xq zCJMKaPdO)EvvKD%-jE>i!-bHT|I3DVOTA^ch6mhOt)$8!a)KJ<(bVfrS03tdChqG3*t zrn5pUDC+Rifd~(aAf4GD>P09_|DbV&LNm z2+wT`@k;}KJ^uE@9-zgOv@D@4-?=uHx}R389T2o(Q3)G^HZmb!s^K~9K8Si@iypl!5)I(U!HpflkFX8R=7fickmX4$4}>`*o- z%cto1wKUMCbmCW=($%3{Fhv)l6?)q{ob8J`l!UTtih66y2TA9kj}P`b2g)T=bXkB& zUG5z11-CRcpXjQwS>Re(0bo?EDu&ZjQwqp@_G1omPKddPqwV@Qw}20Ay?m#4ke=OpQ3y%?Of}(XLK!u);nVNQB*0k zDOYqTmSY2De_)a(rs&1>tku;Jy=lcHT~jj6wb)=BZ`0NNI&ZTCbbW_%!xY_EL%Z51 z>GenHCdbX~pm(!liUVwlH#w#Ntrd=)W}D-n&m1cdh5_oqOqYNWc2OVgK|uA=1ilX7 zIp7$R48tUEE}NtSzc>U!Y!We>QN52*JzxVgcr3xUVEe8A2f=;E5_}s7zP(KF1~`oi zUcc+KTi9v0R&ZL3opu{LEyhl}z3jAG{Z6~Xbw|u`$82?zK6U4TZGeVg*EH;!DNFed zh=aukk2RO|0Gzmp_Lted$7OqG zQ-B{dy~1$@0GaI?r2qSsnmZ{30X}^25Z#+-dz|L;?j$`hm^e)LwjH4dIjg8i@MP@~ zSOs*v7t<2hZT;Y56gW5#8$>BV5#gN@!b9{C4?*!b*2mfa!&Qa}K1`2z=PeMN-8C1y zKN@RWJ4K&_wjS7{^q2>>6hJI^*ae%SPuG^Ao}kZECHDCMIXofs7wC%~*aG}wCF(e1 z9A5bOBz?&{o+0vz68e|vD;3bACG@Y-*D9e$OXy#(h#o7Uf1@&b%r#g8_im5;J+K4| ze@jf+sC+LOQ#zF&VC_e+W8()euI5o z`5o3Pls{m-TKN;!Yn7+4UgtnwulyC?H#^i0I9RthShqP?w>wyOIFNTaxOXdmPnN_+ z2lvEY2|u&g&C0(Xrki>YcK>;Zo*7hXVh@NK*WV5NKN24JnVy!>Ln81PEx>w2%sC2# gp2ta<6pcL(iTXjH&O0muvHOJL*-(^?7A{_6pD15!5iW&6|d?RCdo# zJKq)R28PaR8uz$jq%~&Qs;y;53aVwD)#nU`M9MJdm8_BDd9`FIo&l53709S&=*k-J z07E2`Aq`_A4D2#PeUaO$LuS~T^1C)xA&^Y%pr&i~5JOG8XHr5VnxY7!nV}^%&+QSl zP)KVwA2v<3%+Me2nF)5Nq}y7ND_P>Vh+nA)4oHx(DT)v_Gi(wn(@uzME-Ux3RJc42n|on`||l>vCp#Vu#ZwHqGUMybQ^9D1smCq z10vYx8IC?JSes(WQ$rUt>ezJNFl`at8Sf;5LkyA|b=o$G=fB~0`KY{);Aj+wLABx= z3NAH*Vw)7M6kF&;BE0Lqorq(cr|^=Sm2~5Z{!}U zLJw^p{?)5cOeiwFC2+(>@EXH8f8d@XpX&7(lQ4tV8<2s@&_M8BFpWiS+Eh%B37IEBYw`R#(m&aaHr*z#}#3Hfrd#;Ob*{> z+ToL+?Wm-UIr|cy<0jX$oZ6~2mNhx`RAnzY3oSzK~4K+P9kER<-Bm1uVaDQ7rH-5FTj)h55=l(R@`Bp6r}h4m(F-SsPp;BAIS zlH#^oV60;6zZ=CncuztRy6E%|7&;zq!zTcZ;6u7FQ1wap2%S;fz{e7<;SJ&Nr_>1n zId(4>p9$X2X#lG3g<|jeuM=P5t9tVFYf8WfEiN%64Jw97)zsA40-q2M%3ey-`T0_D zmYd#5`z06lNzKxTWq56aQ!1lrqhx0JDXqZKMKOeFk=G*J92JufXugRk8t8ppTtny` z6*$pkZx9O~P4xVh{v9AmG4ERwzoTUZTT+QTXdmlMWPU?O@6<0uVfc=o61~G{!FKF$ z&YnRhNeT@&NIp#OAt9ZVyZYtsRrG`)cdtOXhwic7sieHOzgO;G#lae^VDKJ>&iB#b z@qT%@&pBLX%cLRXSla3MGw4}rLkuS{LbN{e`6ON>>i5Lk=vZyXHu@>(zz=j*OFr(T zNWv!-LqDS~v4XMXTNqCzAD~H`uHdEV)NPC>@8D(OhPX)5aP|~* zlQ^Tpt%+aJF?}E5<*CFpVMO?dlZwDJE_(v9XR$VsBp!jFP&k8EJbF8!B@o|8wqH#o zdsi_VMnz2)IghQ4n1th!%eIR7nl-LGw5rMqVYoJLw38`lZ3ZyXII`y=@iLgZh}^Nc9~ diff --git a/ui-tests/bin/lib/CustomKeywords.class b/ui-tests/bin/lib/CustomKeywords.class deleted file mode 100644 index e35c7625d27b56f6bd4897607c207ced44826497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2440 zcmb7GZBrXn6n<_<*<`ydVR^AFtrd-sY%D1O>kG6B(F#o{+Efs+#$|H}3&}3sY*2ne ze~90)?eJnp$4_>~ALV%N?k0p`VeDk)ZgTH=dCqg6b2k6{`}>~&#?fTBoNqQcC$6zs%A@uV{W?=x)=sd+K%~V42fjJ)m_ub*YrkX-deXAw4&`) zvxZ&a8+x;m4FWoRy~YjKw5@F0c8WnNmnp(Ro`HSO&^>KhrhAW}E0tbSAmgHpC=`a? zWR<&ly;dukE}wB6eU~AZO0R~eYFe&Y=UId78)TntIZi3Kj2;;gBp9OZhS{J3iYF^0 zOjlCHP8McOt72N!DIZb4Kr}$W4cl`0FD_9NYE231x@j>CrdEra`i>q@>N@Duh@!B?bBwS~>b)NaDdL_I~FvK>)gH#8K#kEbki>d#!lRj;v;2jKK z#7(?Q(RHUvEcS)eNVn)TiGco8NDPKKmp9zrya}NpbLi#$8g}b;kg?(IIUbPuY^a z?mpt{+~JnNiK4-z;c(sM`A)Yo-Ey3C?K2z0BE$9b)EUD!q_XKGjf zZ~iu@!-^ADdTB-T)F1TvE7~NICEYRgwHkjc7P`HnY4L~6`WknF9l2yT9fRLDYaGLb zGb+eW$f6m5#52SYr>86!pp!Vwd3u%6`jmc+(la7-^@bYJj__U- z%g2#Keo*ct-uLp4cwhzS5jqi|W5S>9u|4m+g&9=1k2#K1+h>9hi+DriQ_$3OPE)m< z`oR%yM{tB(1g$U)GU_JNC}N2yCNN3gMbZgMDUyzA`}kCi{EC=%h|l+)W44%ijUKUk zh`E*G3(RKrQ4p8}=_K|bz|86C3`46lV zDAnpKJXs-{4)9YeHvN4F%qN4`spnYx8@;sdqxu&)6kbC;gjsln$_lyGUSLgoiES?e L`MQ)Mf(!ovcZY>G diff --git a/ui-tests/bin/lib/internal/GlobalVariable.class b/ui-tests/bin/lib/internal/GlobalVariable.class deleted file mode 100644 index 67d8e66bc00c8743a6060f8689a3b7d558952a5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3510 zcmb7HYj+b>6x}yXn=~Dy41zpFMXOCGZBq&Y@=$9PgrAAbR`3116bVU<18 zE$eo6ukB3f_7UB+^eNj+KnQdm(`WUpt(T{>2d9pihL=E#z?x~-ac1WN`Ck9KzS}CW zYN?<8Kv^JpaCm%Z^6tYq0X6qezdISLtLo{VWenSTwYsldbOf}V<4$J{r(l-!S~VMn zb{&Br)}Vfs`q{eSP6d}^RSGez7Fa1= z=6#5ZDG01h_cX~)!5XZUw(AsJhUM-2x>6wSm8>ewa!rnnppv@`JA}2VA%9`IdBe3T z-feT9DH$Fr=oMas1U8a9!!>o!9MvlVUFoA2pH@#Gs(F^3r515shprT^#q}+`SKwh3 z%%Wbiy(H2}BnA3Po>$qC%{s;jz0W8VtiFQn^%cz7{)+CEidMN`y8YA6Z2y$eZ|F&6 zX!38lUqp2ReI!SU1@@;e&iMaGLR69KPGDIKbf6!bBrsM)+nB4*TGb@BNI^_4tcdOZ zD`FG>+ok`TSU4d^wnG>tr|Rw4J}@wl#7-F`F0k2fX0pd;s@dbZr`x>!hU4FIx4PH zv~2T$K4UIzHDMH1ch!^~#4JS2lCt1s>tUs`CNDH7U&z$*7?aK6Zh>X8x*|24X~=Km zo}*wK_sB|_P>@20gm6?K-H`4EeJ+9f3AmnW&?R?A!w1>+H11Ok91_?h9!%i@=z-%! zTnY@?e;z=A8&xw3cwM?l&+0isU8_9n95?BwRQ5a~VSIu+CP*!7nbPw28iw*LScVu%23ZmOUHSH_l?mqcHP z-5ovI=5R>*O;OFJ!6WI^dFRxt;e?F-u)t+qvVlfM-iC+;$8I+76urY{(R9tSVRF>0 z?g}QwaMWya6E~JjjXHKF+ES@;C_KSlU9oFyqfZI6lJ6l3PqOm(dB?-1!NKB`$%Cxp zB%T$xyip*5t*q3BrPFL8`=i`%s0js+;c_N%FEg&6^Vb%7kRxEV z_5)VV^KGY{$NJG;ZSs3;=pFxtI|5&DRrohftE+G|e40jKz zw=Cec80K;3uh^f<`0hpqwTy2*+Ux($4fd*!;RL#I z2zL?Q3%CM@DU0Dt%GZ%pP?F-iQNvnx@Aa6&2AslGopJe=3<=y!{TMa7N!$@N_BE2) zJnlXFE$+)@e#detoyXKf?i}vRoQHXqs^}DQ7=#Y4qq&fwwC}KC;y1+4j%yP<1Rj8t z)D4Q54h_^WVw;wsjyxjiummgIU(4f=N4ku$k7=3S1vqik-Bj>UsJ4bmGI1qPTY%TH zs8z#kQ)hE=1Tj;x;zPA=p5c4lb`t>X!{lOj3Mzig1EdE diff --git a/ui-tests/console.properties b/ui-tests/console.properties deleted file mode 100644 index c89f16f3d..000000000 --- a/ui-tests/console.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Wed Dec 05 10:12:31 PST 2018 -deviceId= -kobitonDeviceId= -remoteWebDriverType=Selenium -remoteWebDriverUrl= diff --git a/ui-tests/runTests.sh b/ui-tests/runTests.sh deleted file mode 100644 index eca6a0d3c..000000000 --- a/ui-tests/runTests.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/Run OCWA test cases" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui-tests/runTestsTesting.sh b/ui-tests/runTestsTesting.sh deleted file mode 100644 index 76ff80ecc..000000000 --- a/ui-tests/runTestsTesting.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui-tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/TestingTestSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties b/ui-tests/settings/external/com.kms.katalon.core.db.DatabaseSettings.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties b/ui-tests/settings/internal/com.kms.katalon.composer.testcase.settings.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui-tests/settings/internal/com.kms.katalon.execution.properties b/ui-tests/settings/internal/com.kms.katalon.execution.properties deleted file mode 100644 index 59a525faa..000000000 --- a/ui-tests/settings/internal/com.kms.katalon.execution.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Dec 11 09:06:20 PST 2018 -execution.default.executionConfiguration="Chrome" -execution.default.timeout=30 -execution.default.openReportAfterExecuting=false -execution.default.quitDriversAfterExecutingTestCase=false -execution.default.quitDriversAfterExecutingTestSuite=true diff --git a/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties b/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties deleted file mode 100644 index 11075e853..000000000 --- a/ui-tests/settings/internal/com.kms.katalon.execution.webui.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Dec 11 09:06:20 PST 2018 -execution.default.webUi.enablePageLoadTimeout=false -execution.default.webUi.pageLoadTimeout=30 -execution.default.webUi.ignorePageLoadTimeOutException=false -execution.default.webUi.actionDelay=0 -execution.default.waitForIEHanging=600 diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties deleted file mode 100644 index 20d3d6ab8..000000000 --- a/ui-tests/settings/internal/com.kms.katalon.integration.analytics.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Tue Dec 11 13:13:12 PST 2018 -analytics.integration.enable=false diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.jira.properties b/ui-tests/settings/internal/com.kms.katalon.integration.jira.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties b/ui-tests/settings/internal/com.kms.katalon.integration.qtest.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui-tests/sonar-project.properties b/ui-tests/sonar-project.properties deleted file mode 100644 index b19e55a67..000000000 --- a/ui-tests/sonar-project.properties +++ /dev/null @@ -1,32 +0,0 @@ -sonar.projectKey=ocwa -sonar.projectName=OCWA Scanning -sonar.projectVersion=0.0.1 -sonar.organization=ajc_bcgov - -sonar.host.url=https://sonarcloud.io - -sonar.sources=src - -sonar.dynamicAnalysis=reuseReports - -sonar.javascript.lcov.reportPaths=coverage/lcov.info -sonar.python.coverage.reportPath=microservices/*/coverage.xml - -# sonar.modules=frontend,forumApi,policyApi,requestApi,validateApi - -frontend.sonar.projectBaseDir=frontend -frontend.sonar.sources=src,server - -forumApi.sonar.projectBaseDir=microservices/forumApi -forumApi.sonar.sources=auth,bin,db,routes - -requestApi.sonar.projectBaseDir=microservices/requestApi -requestApi.sonar.sources=auth,bin,db,routes - -policyApi.sonar.projectBaseDir=microservices -policyApi.sonar.sources=policyApi/db,policyApi/v1 -policyApi.sonar.python.coverage.reportPath=policyApi/coverage.xml - -validateApi.sonar.projectBaseDir=microservices -validateApi.sonar.sources=validateApi/db,validateApi/v1,validateApi/validator -validateApi.sonar.python.coverage.reportPath=validateApi/coverage.xml diff --git a/ui_tests/.gitignore b/ui_tests/.gitignore index 0b12e47b0..8ce403b55 100644 --- a/ui_tests/.gitignore +++ b/ui_tests/.gitignore @@ -6,3 +6,4 @@ Profiles/default.glbl .settings /bin/ Libs/TempTest*.groovy +Libs/TempTemp*.groovy \ No newline at end of file diff --git a/ui_tests/.project b/ui_tests/.project index a3c48d6bb..3955e7e6b 100644 --- a/ui_tests/.project +++ b/ui_tests/.project @@ -1,74 +1,92 @@ - - - OCWA.prj - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.groovy.core.groovyNature - org.eclipse.jdt.core.javanature - - - - 0 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 0 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 0 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 0 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - 1545259433429 - - 10 - - org.eclipse.core.resources.regexFilterMatcher - .*\.svn$ - - - - 1545259433448 - - 6 - - org.eclipse.core.resources.regexFilterMatcher - (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) - - - - + + + OCWA.prj + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.groovy.core.groovyNature + org.eclipse.jdt.core.javanature + + + + 0 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 0 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 0 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 0 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545259433429 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545259433448 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + 1545415474049 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1545415474069 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + + + diff --git a/ui_tests/Data Files/TestFile1.dat b/ui_tests/Data Files/TestFile1.dat new file mode 100644 index 000000000..ef8081321 --- /dev/null +++ b/ui_tests/Data Files/TestFile1.dat @@ -0,0 +1,16 @@ + + + file for testing upload + TestFile1 + + true + COMMA + 679aba66-2311-432f-8bab-84485811301a + C:\Users\PaulR\Documents\2 - Metadata\HAS project\hospital_visits_bc_2017.csv + CSV + false + + false + + false + diff --git a/ui_tests/Data Files/TestFile2.dat b/ui_tests/Data Files/TestFile2.dat new file mode 100644 index 000000000..4e68b8432 --- /dev/null +++ b/ui_tests/Data Files/TestFile2.dat @@ -0,0 +1,16 @@ + + + File for testing file upload + TestFile2 + + true + + 22393f29-c163-446c-aa0b-da83fe18248a + C:\Users\PaulR\Documents\2 - Metadata\HAS project\sports_accidents_bc_2017.xls + ExcelFile + false + + false + sports_accidents_bc_2017 + false + diff --git a/ui_tests/Include/features/Login.feature b/ui_tests/Include/features/Login.feature deleted file mode 100644 index 9a29cd767..000000000 --- a/ui_tests/Include/features/Login.feature +++ /dev/null @@ -1,32 +0,0 @@ -#Author: your.email@your.domain.com -#Keywords Summary : -#Feature: List of scenarios. -#Scenario: Business rule through list of steps with arguments. -#Given: Some precondition step -#When: Some key actions -#Then: To observe outcomes or validation -#And,But: To enumerate more Given,When,Then steps -#Scenario Outline: List of steps for data-driven as an Examples and -#Examples: Container for s table -#Background: List of steps run before each of the scenarios -#""" (Doc Strings) -#| (Data Tables) -#@ (Tags/Labels):To group Scenarios -#<> (placeholder) -#"" -## (Comments) -#Sample Feature Definition Template - - -@loginFeature -Feature: Login - Test the login functionality of the application - - @smoke - Scenario: Test the login functionality of EA application - Given I navigate to the login page - And I enter the following for Login - | username | password | - | admin | adminpassword | - And I click the login button - Then I should see the home page \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 5f5053221..6afe54667 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -57,32 +57,34 @@ class Requester_step_def_ks { @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') - WebUI.delay(5) - WebUI.closeBrowser() - - //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Login')) + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + TestObject loginButton = new TestObject("app-auth-login-button") + loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) + WebUI.waitForElementClickable(loginButton, 30) + WebUI.click(loginButton) - //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - //WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - //WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } @Given("requester has started a request") def requester_starts_new_request() { - //newRequestButtonObject = new TestObject("new-request-button") - //newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + newRequestButtonObject = new TestObject("new-request-button") + newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) - //WebUI.waitForPageLoad(30) + WebUI.waitForPageLoad(30) + WebUI.delay(5) - //WebUI.waitForElementClickable(newRequestButtonObject, 30) - //WebUI.click(newRequestButtonObject) - //request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() - //WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + WebUI.waitForElementClickable(newRequestButtonObject, 30) + WebUI.click(newRequestButtonObject) + request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + WebUI.delay(2) } @Given("has not submitted the request") @@ -91,66 +93,75 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { - // selenium.click("id=request-form-save-files-button") - // selenium.attachFile("id=fileupload", "C:\\Users\\PaulR\\Documents\\2 - Metadata\\HAS project\\hospital_visits_bc_2017.csv") - } - - @Given("the output files do not violate any blocking rules") - def output_files_do_not_violate_blocking_rules(){} - - @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") - def requester_affirms_output_is_safe() { - } - - @Given("requester has a submitted request") - def request_has_submitted_a_request(){ - requester_starts_new_request() - requester_adds_output_files() - requester_submits_request() - } - - @Given("the request has been claimed by an output checker") - def request_has_been_claimed_by_a_oc(){} - - @When("the requester saves their request") - def requester_saves_new_request() { - //requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - //requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - //WebUI.click(requestFormSaveCloseButtonObject) - } - @When("requester submits their request") - def requester_submits_request() { - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") + requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, "request-form-save-files-button", true) + WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) + WebUI.click(requestFormSaveFilesButton) + TestObject uploadFileButton = new TestObject("fileUploadButton") + uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true) + //WebUI.sendKeys(uploadFileButton, "C:\\\\Users\\PaulR\\\\Documents\\\\2 - Metadata\\\\HAS project\\\\hospital_visits_bc_2017.csv") + //WebUI.sendKeys(uploadFileButton, findTestData('TestFile1')) + //WebUI.sendKeys(uploadFileButton, '/Data Files/TestFile1')) + //WebUI.delay(5) } - @When("requester writes and submits a new comment") - def requester_creates_a_new_comment(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) - //WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Smcuk')) - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) - - //WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) - - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') - } - - @Then("the requester should be able to re-open the request and pick up where they left off") - def confirm_draft_save_was_successful() { - //WebUI.waitForPageLoad(0) - //WebUI.verifyTextPresent(request_name, false) - } - - @Then("the requester's request is put in awaiting review") - def confirm_request_is_in_awaiting_review_state(){ - WebUI.verifyTextPresent("Awaiting review", false) - } - - @Then("the requester should not be able to submit the request") - def requester_is_not_able_to_submit_request(){ - WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) - } +@Given("the output files do not violate any blocking rules") +def output_files_do_not_violate_blocking_rules(){} + +@Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") +def requester_affirms_output_is_safe() { +} + +@Given("requester has a submitted request") +def request_has_submitted_a_request(){ + requester_starts_new_request() + requester_adds_output_files() + requester_submits_request() +} + +@Given("the request has been claimed by an output checker") +def request_has_been_claimed_by_a_oc(){} + +@When("the requester saves their request") +def requester_saves_new_request() { + requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + WebUI.click(requestFormSaveCloseButtonObject) +} + +@When("requester submits their request") +def requester_submits_request() { + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) +} + +@When("requester writes and submits a new comment") +def requester_creates_a_new_comment(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) + + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') +} + +@Then("the requester should be able to re-open the request and pick up where they left off") +def confirm_draft_save_was_successful() { + WebUI.waitForPageLoad(20) + WebUI.verifyTextPresent(request_name, false) + WebUI.closeBrowser() +} + +@Then("the requester's request is put in awaiting review") +def confirm_request_is_in_awaiting_review_state(){ + WebUI.verifyTextPresent("Awaiting review", false) + WebUI.closeBrowser() +} + +@Then("the requester should not be able to submit the request") +def requester_is_not_able_to_submit_request(){ + WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + WebUI.closeBrowser() +} } \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy deleted file mode 100644 index 1e1f8b79e..000000000 --- a/ui_tests/Include/scripts/groovy/com/ea/steps/CucumberEARunner.groovy +++ /dev/null @@ -1,14 +0,0 @@ -package com.ea.steps - - -import org.junit.runner.RunWith; - -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; - - - -@RunWith(Cucumber.class) -@CucumberOptions(features="ui_tests/Include/features", glue="", plugin=["pretty", "html:ReportFolder", "json:ReportFolder/cucumber.json"]) -public class CucumberEARunner { -} diff --git a/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy b/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy deleted file mode 100644 index efe3bfe0d..000000000 --- a/ui_tests/Include/scripts/groovy/com/ea/steps/LoginSteps.groovy +++ /dev/null @@ -1,103 +0,0 @@ -package com.ea.steps -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI - -import cucumber.api.TypeRegistry; -import cucumber.api.TypeRegistryConfigurer; -import cucumber.api.java.en.And -import cucumber.api.java.en.Given -import cucumber.api.java.en.Then -import cucumber.api.java.en.When -import io.cucumber.datatable.DataTableType; -import io.cucumber.datatable.TableEntryTransformer; - - -/* - * Author: Karthik KK - * Company: ExecuteAutomation - * Type: StepDefinition - * Step : LoginStep - */ -class LoginSteps { - @Given("I navigate to the login page") - def I_navigate_to_the_login_page() { - WebUI.openBrowser('') - WebUI.navigateToUrl('http://www.executeautomation.com/demosite/Login.html') - } - - - //Obsolete step - @When('I enter the username as "(.*) and password as "(.*)"') - def I_enter_username_password(String userName, String password) { - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), userName) - - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), password) - } - - @And("I enter the following for Login") - def I_enter_the_following_for_login(List table){ - // Way 1 - To get data from DataTable Type - // List> data = table.asMaps(String.class, String.class); - - // Way 2 - To get work with custom types using Lust - // //Create an ArrayList - // List users = new ArrayList(); - // //Store all the users - // users = table.asList(User.class); - - - //Iterate through the values - for (User user: table){ - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_UserName'), user.username) - - WebUI.setText(findTestObject('Object Repository/Page_Execute Automation/input_Login_Password'), user.password) - } - } - - - @Then("I click the login button") - def I_Click_login_button() { - WebUI.click(findTestObject('Object Repository/Page_Execute Automation/input_Login_Login')) - } - - @Then("I should see the home page") - def I_Should_see_the_home_page(){ - - //Assertions has been done ! - } -} - - -//Custom class responsible to get UserName and Password from table steps -class User { - public String username; - public String password; - - public User(String userName, String passWord) { - username= userName; - password = passWord; - } -} - - -//Custom Transformer to convert the custom User type -class Configurer implements TypeRegistryConfigurer { - - @Override - public void configureTypeRegistry(TypeRegistry registry) { - - registry.defineDataTableType(new DataTableType(User.class, new TableEntryTransformer() { - @Override - public User transform(Map entry) { - return new User(entry.get("username"),entry.get("password")); - } - })); - } - - @Override - public Locale locale() { - return Locale.ENGLISH; - } - -} diff --git a/ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy similarity index 100% rename from ui-tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy rename to ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy diff --git a/ui_tests/Libs/CustomKeywords.groovy b/ui_tests/Libs/CustomKeywords.groovy index c595a4f8a..9457decb7 100644 --- a/ui_tests/Libs/CustomKeywords.groovy +++ b/ui_tests/Libs/CustomKeywords.groovy @@ -3,3 +3,7 @@ * This class is generated automatically by Katalon Studio and should not be modified or deleted. */ + +def static "test_OCWA_keywords.random_test_request_name.gen_random_test_request_name"() { + (new test_OCWA_keywords.random_test_request_name()).gen_random_test_request_name() +} diff --git a/ui_tests/Libs/internal/GlobalVariable.groovy b/ui_tests/Libs/internal/GlobalVariable.groovy index 073fd2170..51b9af8e5 100644 --- a/ui_tests/Libs/internal/GlobalVariable.groovy +++ b/ui_tests/Libs/internal/GlobalVariable.groovy @@ -21,7 +21,7 @@ public class GlobalVariable { static { def allVariables = [:] - allVariables.put('default', [:]) + allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca']) allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) String profileName = RunConfiguration.getExecutionProfile() diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs similarity index 96% rename from ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs rename to ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs index 231e9f891..e4f34d42a 100644 --- a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs @@ -1,107 +1,107 @@ - - - - input_Password_login - - b03993b5-c5ae-4031-8150-2361e6dc57b7 - - - XPATH - //input[@id='kc-login'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - tabindex - Main - 4 - - - false - equals - class - Main - btn btn-primary btn-lg - - - true - equals - name - Main - login - - - true - equals - id - Main - kc-login - - - true - equals - type - Main - submit - - - false - equals - value - Main - Log in - - - false - equals - xpath - Main - id("kc-login") - - - true - equals - xpath:attributes - //input[@id='kc-login'] - - - false - equals - xpath:idRelative - //div[@id='kc-form-buttons']/div/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[3] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'kc-login', '"', ')')])[1]/preceding::input[1] - - - false - equals - xpath:position - //div[3]/div[2]/div/input - - + + + + input_Password_login + + b03993b5-c5ae-4031-8150-2361e6dc57b7 + + + XPATH + //input[@id='kc-login'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 4 + + + false + equals + class + Main + btn btn-primary btn-lg + + + true + equals + name + Main + login + + + true + equals + id + Main + kc-login + + + true + equals + type + Main + submit + + + false + equals + value + Main + Log in + + + false + equals + xpath + Main + id("kc-login") + + + true + equals + xpath:attributes + //input[@id='kc-login'] + + + false + equals + xpath:idRelative + //div[@id='kc-form-buttons']/div/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[3] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'kc-login', '"', ')')])[1]/preceding::input[1] + + + false + equals + xpath:position + //div[3]/div[2]/div/input + + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs similarity index 96% rename from ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs rename to ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs index 9a0da9be0..4b818c9f3 100644 --- a/ui-tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs @@ -1,107 +1,107 @@ - - - - input_Password_password - - 0e5ab8cd-490d-4fe5-8476-6643d833291e - - - XPATH - //input[@id='password'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - tabindex - Main - 2 - - - true - equals - id - Main - password - - - false - equals - class - Main - form-control - - - true - equals - name - Main - password - - - true - equals - type - Main - password - - - false - equals - autocomplete - Main - off - - - false - equals - xpath - Main - id("password") - - - true - equals - xpath:attributes - //input[@id='password'] - - - false - equals - xpath:idRelative - //form[@id='kc-form-login']/div[2]/div[2]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[2] - - - false - equals - xpath:position - //div[2]/div[2]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[2] - - + + + + input_Password_password + + 0e5ab8cd-490d-4fe5-8476-6643d833291e + + + XPATH + //input[@id='password'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 2 + + + true + equals + id + Main + password + + + false + equals + class + Main + form-control + + + true + equals + name + Main + password + + + true + equals + type + Main + password + + + false + equals + autocomplete + Main + off + + + false + equals + xpath + Main + id("password") + + + true + equals + xpath:attributes + //input[@id='password'] + + + false + equals + xpath:idRelative + //form[@id='kc-form-login']/div[2]/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[2] + + + false + equals + xpath:position + //div[2]/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[2] + + diff --git a/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs similarity index 96% rename from ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs rename to ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs index e4518409c..6f517919f 100644 --- a/ui-tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs @@ -1,113 +1,113 @@ - - - - input_Username or email_userna - - 1e087123-1a2b-412f-9b3f-f68243f2f4cc - - - XPATH - //input[@id='username'] - - - XPATH - false - - true - equals - tag - Main - input - - - false - equals - tabindex - Main - 1 - - - true - equals - id - Main - username - - - false - equals - class - Main - form-control - - - true - equals - name - Main - username - - - true - equals - type - Main - text - - - false - equals - autocomplete - Main - off - - - false - equals - xpath - Main - id("username") - - - true - equals - xpath:attributes - //input[@id='username'] - - - false - equals - xpath:idRelative - //form[@id='kc-form-login']/div/div[2]/input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='ocwa'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/preceding::input[1] - - - false - equals - xpath:position - //input - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[3] - - + + + + input_Username or email_userna + + 1e087123-1a2b-412f-9b3f-f68243f2f4cc + + + XPATH + //input[@id='username'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + tabindex + Main + 1 + + + true + equals + id + Main + username + + + false + equals + class + Main + form-control + + + true + equals + name + Main + username + + + true + equals + type + Main + text + + + false + equals + autocomplete + Main + off + + + false + equals + xpath + Main + id("username") + + + true + equals + xpath:attributes + //input[@id='username'] + + + false + equals + xpath:idRelative + //form[@id='kc-form-login']/div/div[2]/input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Username or email'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='ocwa'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Password'])[1]/preceding::input[1] + + + false + equals + xpath:position + //input + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'username', '"', ')')])[1]/preceding::input[3] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs b/ui_tests/Object Repository/Page_OCWA Development Version/a_Discussion.rs similarity index 58% rename from ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs rename to ui_tests/Object Repository/Page_OCWA Development Version/a_Discussion.rs index 4b8862f1c..cd2c58b6c 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/a_gfggggg.rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/a_Discussion.rs @@ -1,91 +1,98 @@ - - - - a_gfggggg - - 8030b58a-35da-4934-a959-42f86e9e595f - - - XPATH - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table/tbody/tr/td[2]/strong/a - - - XPATH - false - - true - equals - tag - Main - a - - - true - equals - href - Main - /requests/5c08241fe35b430013db0cae - - - true - equals - text - Main - gfggggg - - - false - equals - xpath - Main - id("main")/div[1]/div[@class="LayerManager__AppWrapper-ues105-0 oCRpv"]/main[@class="src-modules-app-components-app-styles_main--HUjPm6n8"]/div[@class="src-modules-app-components-app-styles_container--Gaae__yt"]/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG epCAxu"]/div[1]/div[1]/div[@class="LoadingContainerAdvanced__Container-sc-1s2zdt8-0 cFyKDm"]/table[@class="DynamicTable__Table-sc-1naczgt-0 cFUPVR"]/tbody[1]/tr[@class="TableRow__TableBodyRow-sc-1kwbh2h-0 jLQmXi"]/td[@class="TableCell__TableBodyCell-sc-1mgclzx-0 dGStZT"]/strong[1]/a[1] - - - true - equals - xpath:idRelative - //div[@id='main']/div/div/main/div[2]/div/div/div[2]/div/div/div/div/div/table/tbody/tr/td[2]/strong/a - - - false - equals - xpath:link - //a[contains(text(),'gfggggg')] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Output Checker'])[1]/following::a[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Updated On'])[1]/following::a[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Dec 5th, 2018'])[1]/preceding::a[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Dec 5th, 2018'])[2]/preceding::a[1] - - - false - equals - xpath:href - //a[contains(@href, '/requests/5c08241fe35b430013db0cae')] - - - false - equals - xpath:position - //strong/a - - + + + + a_Discussion + + 8d15b0ae-a30c-4777-bee4-b4d0055b26ff + + + BASIC + //a[(text() = ' Discussion' or . = ' Discussion')] + + + BASIC + false + + true + equals + tag + Main + a + + + false + equals + class + Main + src-modules-requests-components-request-styles_tab--gsRHpC7s + + + false + equals + href + Main + /requests/5c09b8cc4dd24b0013dafd7e/discussion + + + true + equals + text + Main + Discussion + + + false + equals + xpath + Main + id("requests-page")/div[@class="sc-dnqmqq hYEhCn"]/div[@class="sc-iwsKbI kTSErh"]/div[@class="sc-jTzLTM gBDbcZ"]/header[@class="src-modules-requests-components-request-styles_header--3R28zHQp"]/div[@class="sc-fjdhpX dBNkfU"]/div[@class="sc-jzJRlG igkucF"]/div[1]/nav[@class="src-modules-requests-components-request-styles_tabs--uQAijO0U"]/a[@class="src-modules-requests-components-request-styles_tab--gsRHpC7s"] + + + true + equals + xpath:idRelative + //div[@id='requests-page']/div/div/div[2]/header/div[2]/div/div/nav/a[2] + + + false + equals + xpath:link + //a[contains(text(),'Discussion')] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Details'])[1]/following::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Awaiting Review'])[1]/following::a[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Purpose'])[1]/preceding::a[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Export Files'])[1]/preceding::a[1] + + + false + equals + xpath:href + //a[contains(@href, '/requests/5c09b8cc4dd24b0013dafd7e/discussion')] + + + false + equals + xpath:position + //a[2] + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs b/ui_tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs similarity index 97% rename from ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs rename to ui_tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs index e44636ebc..ad24da384 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/input_Request Name_name.rs @@ -1,111 +1,111 @@ - - - - input_Request Name_name - - 381e4370-629e-492b-bd3c-5ca7701548b9 - - - XPATH - //input[@id='name'] - - - BASIC - //input[@id = 'name' and @name = 'name' and @type = 'text'] - - - BASIC - false - - true - equals - tag - Main - input - - - false - equals - class - Main - Input__InputElement-sc-1o6bj35-0 bfCuIo - - - true - equals - id - Main - name - - - true - equals - name - Main - name - - - false - equals - spellcheck - Main - true - - - true - equals - type - Main - text - - - false - equals - value - Main - R - - - false - equals - xpath - Main - id("name") - - - true - equals - xpath:attributes - //input[@id='name'] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::input[1] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('These fields aren', "'", 't required but are recommended')])[1]/preceding::input[1] - - - false - equals - xpath:position - //div/div/div/div/div/input - - + + + + input_Request Name_name + + 381e4370-629e-492b-bd3c-5ca7701548b9 + + + XPATH + //input[@id='name'] + + + BASIC + //input[@id = 'name' and @name = 'name' and @type = 'text'] + + + BASIC + false + + true + equals + tag + Main + input + + + false + equals + class + Main + Input__InputElement-sc-1o6bj35-0 bfCuIo + + + true + equals + id + Main + name + + + true + equals + name + Main + name + + + false + equals + spellcheck + Main + true + + + true + equals + type + Main + text + + + false + equals + value + Main + R + + + false + equals + xpath + Main + id("name") + + + true + equals + xpath:attributes + //input[@id='name'] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Request Name'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='*'])[1]/following::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Additional Information'])[1]/preceding::input[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('These fields aren', "'", 't required but are recommended')])[1]/preceding::input[1] + + + false + equals + xpath:position + //div/div/div/div/div/input + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Save (1).rs similarity index 64% rename from ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs rename to ui_tests/Object Repository/Page_OCWA Development Version/span_Save (1).rs index 03b281a97..8fbb80be0 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request_1.rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Save (1).rs @@ -1,70 +1,60 @@ - - - - span_New Request_1 - - c057b988-a971-4de5-80a1-50d6b5f07785 - - - XPATH - //button[@id='new-request-button']/span/span[2] - - - BASIC - id("new-request-button")/span[1]/span[2][count(. | //span[(text() = 'New Request' or . = 'New Request')]) = count(//span[(text() = 'New Request' or . = 'New Request')])] - - - BASIC - false - - true - equals - tag - Main - span - - - true - equals - text - Main - New Request - - - true - equals - xpath - Main - id("new-request-button")/span[1]/span[2] - - - true - equals - xpath:idRelative - //button[@id='new-request-button']/span/span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] - - - false - equals - xpath:position - //span[2] - - + + + + span_Save (1) + + 557e2e28-1535-41ee-bc5c-0891d683ab62 + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Save + + + false + equals + xpath + Main + id("request-form-save-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //button[@id='request-form-save-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Submit for Review'])[1]/preceding::span[1] + + + false + equals + xpath:position + //div[3]/div/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs similarity index 64% rename from ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs rename to ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs index 8d0b1ce38..f6d179138 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_Login.rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs @@ -1,54 +1,54 @@ - - - - span_Login - - 43ba404e-395a-4174-ad6f-b2c20759c0af - - - XPATH - //span/span - - - XPATH - false - - true - equals - tag - Main - span - - - true - equals - text - Main - Login - - - false - equals - xpath - Main - id("app-auth-login-button")/span[1]/span[1] - - - true - equals - xpath:idRelative - //a[@id='app-auth-login-button']/span/span - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] - - - false - equals - xpath:position - //span/span - - + + + + span_Submit for Review + + f241e897-ea5f-4f0b-a1e4-6f96813f8653 + BASIC + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Submit for Review + + + false + equals + xpath + Main + id("request-form-submit-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //button[@id='request-form-submit-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Save & Close'])[1]/following::span[4] + + + false + equals + xpath:position + //div[3]/div[2]/button/span/span + + diff --git a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Withdraw.rs similarity index 67% rename from ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs rename to ui_tests/Object Repository/Page_OCWA Development Version/span_Withdraw.rs index e2c0eb8be..b89ddb147 100644 --- a/ui-tests/Object Repository/Page_OCWA Development Version/span_New Request (1).rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Withdraw.rs @@ -1,79 +1,73 @@ - - - - span_New Request (1) - - 804916e5-5448-43d1-9965-9b4bfe3f5ebf - - - XPATH - //div[@id='main']/div/div/main/div/div/button/span/span[2] - - - BASIC - false - - true - equals - tag - Main - span - - - true - equals - text - Main - New Request - - - true - equals - xpath - Main - id("new-request-button")/span[1]/span[2] - - - true - equals - id - Main - new-request-button - - - true - equals - xpath:idRelative - //button[@id='new-request-button']/span/span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='OCWA Export Tool'])[1]/following::span[4] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/preceding::span[2] - - - false - equals - xpath:neighbor - (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/preceding::span[2] - - - false - equals - xpath:position - //span[2] - - - false - equals - xpath:idRelative - //div[@id='main']/div/div/main/div/div/button/span/span[2] - - + + + + span_Withdraw + + b8e20b19-e579-48bd-93f9-9457ad427bdc + BASIC + false + + true + equals + tag + Main + span + + + false + equals + class + Main + ItemParts__Content-sc-14xek3m-5 jRBaLt + + + true + equals + text + Main + Withdraw + + + false + equals + xpath + Main + id("259cb670-fe56-11e8-a449-7fc7a1df17a7")/div[1]/span[@class="Item-z6qfkt-2 fawwoK"]/span[@class="ItemParts__ContentWrapper-sc-14xek3m-4 eDgbRC"]/span[@class="ItemParts__Content-sc-14xek3m-5 jRBaLt"] + + + true + equals + xpath:idRelative + //div[@id='259cb670-fe56-11e8-a449-7fc7a1df17a7']/div/span/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Actions'])[11]/following::span[5] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='-'])[11]/following::span[7] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancel'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Test Anotehr'])[1]/preceding::span[5] + + + false + equals + xpath:position + //div/span/span/span + + diff --git a/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy b/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy deleted file mode 100644 index f297771da..000000000 --- a/ui_tests/Scripts/ExecuteAutomation_TC1/Script1536389635449.groovy +++ /dev/null @@ -1,18 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.ea.steps.CucumberEARunner -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.cucumber.keyword.CucumberBuiltinKeywords as CucumberKW -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testobject.TestObject as TestObject -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import internal.GlobalVariable as GlobalVariable - -CucumberKW.runWithCucumberRunner(CucumberEARunner.class) diff --git a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy index 3b1c2856f..06baecc91 100644 --- a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy +++ b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy @@ -15,3 +15,7 @@ import internal.GlobalVariable as GlobalVariable CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +not_run: CucumberKW.runFeatureFile('Include/features/requester/create_a_new_request.feature') + +//WebUI.uploadFile(findTestObject(null), findTestData('TestFile1').getValue(1, 1)) + diff --git a/ui_tests/Test Cases/ExecuteAutomation_TC1.tc b/ui_tests/Test Cases/ExecuteAutomation_TC1.tc deleted file mode 100644 index fce57605d..000000000 --- a/ui_tests/Test Cases/ExecuteAutomation_TC1.tc +++ /dev/null @@ -1,8 +0,0 @@ - - - - ExecuteAutomation_TC1 - - - 9ccc1ff2-1a70-4f4b-ad95-dad93a1390b8 - diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts index d2f5f6ad0..366755943 100644 --- a/ui_tests/Test Suites/CucumberSuite.ts +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -1,20 +1,20 @@ - - - - CucumberSuite - - false - 2018-12-19T14:46:16 - - 0 - 30 - true - false - 4efd54cc-68dc-4a64-a8f1-7ae0c49473f5 - - f69ad29e-d701-467b-8299-76addc057f6a - false - true - Test Cases/RunCucumberTests - - + + + + CucumberSuite + + false + 2018-12-21T10:04:40 + + 0 + 30 + true + false + 4efd54cc-68dc-4a64-a8f1-7ae0c49473f5 + + f69ad29e-d701-467b-8299-76addc057f6a + false + true + Test Cases/RunCucumberTests + + diff --git a/ui_tests/Test Suites/TestSuite1.groovy b/ui_tests/Test Suites/TestSuite1.groovy deleted file mode 100644 index 49ab4777d..000000000 --- a/ui_tests/Test Suites/TestSuite1.groovy +++ /dev/null @@ -1,66 +0,0 @@ -import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint -import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase -import static com.kms.katalon.core.testdata.TestDataFactory.findTestData -import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject - -import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint -import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory -import com.kms.katalon.core.model.FailureHandling as FailureHandling -import com.kms.katalon.core.testcase.TestCase as TestCase -import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory -import com.kms.katalon.core.testdata.TestData as TestData -import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory -import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository -import com.kms.katalon.core.testobject.TestObject as TestObject - -import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS -import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI -import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile - -import internal.GlobalVariable as GlobalVariable - -import com.kms.katalon.core.annotation.SetUp -import com.kms.katalon.core.annotation.SetupTestCase -import com.kms.katalon.core.annotation.TearDown -import com.kms.katalon.core.annotation.TearDownTestCase - -/** - * Some methods below are samples for using SetUp/TearDown in a test suite. - */ - -/** - * Setup test suite environment. - */ -@SetUp(skipped = true) // Please change skipped to be false to activate this method. -def setUp() { - // Put your code here. -} - -/** - * Clean test suites environment. - */ -@TearDown(skipped = true) // Please change skipped to be false to activate this method. -def tearDown() { - // Put your code here. -} - -/** - * Run before each test case starts. - */ -@SetupTestCase(skipped = true) // Please change skipped to be false to activate this method. -def setupTestCase() { - // Put your code here. -} - -/** - * Run after each test case ends. - */ -@TearDownTestCase(skipped = true) // Please change skipped to be false to activate this method. -def tearDownTestCase() { - // Put your code here. -} - -/** - * References: - * Groovy tutorial page: http://docs.groovy-lang.org/next/html/documentation/ - */ \ No newline at end of file diff --git a/ui_tests/Test Suites/TestSuite1.ts b/ui_tests/Test Suites/TestSuite1.ts deleted file mode 100644 index a15c181f7..000000000 --- a/ui_tests/Test Suites/TestSuite1.ts +++ /dev/null @@ -1,20 +0,0 @@ - - - - TestSuite1 - - false - 2018-12-19T13:44:58 - - 0 - 30 - true - false - e8a1ffd6-0ef9-4ac4-9cad-c711a822a0a5 - - 2521c26f-59d1-446f-9fbe-59281ccceb99 - false - true - Test Cases/ExecuteAutomation_TC1 - - diff --git a/ui_tests/runTests.sh b/ui_tests/runTests.sh deleted file mode 100644 index 79d2780ee..000000000 --- a/ui_tests/runTests.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Starting tests" - -katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" \ No newline at end of file diff --git a/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties b/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties index e69de29bb..69aff29b0 100644 --- a/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties +++ b/ui_tests/settings/internal/com.kms.katalon.integration.analytics.properties @@ -0,0 +1,9 @@ +#Thu Dec 20 15:08:54 PST 2018 +analytics.integration.enable=false +analytics.authentication.encryptionEnabled=true +analytics.server.endpoint="JkYzbGlbK9hM2kll81qSoXfzapQDQgaKmEIPN3wKSiw\=" +analytics.authentication.email="AxsQjog1bPIUG8VBB6gpp84F7pbRMrNxvsgIrp3z4Lk\=" +analytics.authentication.password="vp5NOwKb2bEOvJi9f6HRYQ\=\=" +analytics.authentication.token="2HXG0Q6IpFQXdOjqg6HLS4RNXdXULS3VOaOCVle/uPQHip8U2YTI2A\=\=" +analytics.team="{\\n \\"id\\"\: 10951,\\n \\"role\\"\: \\"OWNER\\",\\n \\"name\\"\: \\"Team paul.ripley@avocette.com\\"\\n}" +analytics.project="{\\n \\"id\\"\: 12655,\\n \\"name\\"\: \\"First Project\\",\\n \\"teamId\\"\: 10951\\n}" From 876a8d4299181f7858d75c1944515dc7a36d147f Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 13:29:10 -0800 Subject: [PATCH 140/226] hard coded url to navigate to in order to troubleshoot issue --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 3 ++- ui_tests/Test Suites/CucumberSuite.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 6afe54667..d71914ff5 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -58,7 +58,8 @@ class Requester_step_def_ks { def requester_login() { WebUI.openBrowser('') - WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = new TestObject("app-auth-login-button") loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) WebUI.waitForElementClickable(loginButton, 30) diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts index 366755943..d3f3504cb 100644 --- a/ui_tests/Test Suites/CucumberSuite.ts +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -4,7 +4,7 @@ CucumberSuite false - 2018-12-21T10:04:40 + 2018-12-21T12:54:35 0 30 From bc92d78e5092d68d957ea3bd959b03b255dd2951 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 14:12:58 -0800 Subject: [PATCH 141/226] add in starting up of frontend --- .travis.yml | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31cfdfca9..b5a93f799 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,34 +57,47 @@ matrix: - cp config/default.json.example config/default.json - yarn - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - + #Start Forum Api - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - NODE_ENV=test npm start & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - - cd /home/travis/build/bcgov/OCWA/frontend + #Start Minio - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - chmod +x minio - export MINIO_ACCESS_KEY="myKey" - export MINIO_SECRET_KEY="mySecret" - ./minio server /tmp & + + #Start TusD + - wget https://github.com/tus/tusd/releases/download/$TUSD_VERSION/tusd_linux_amd64.tar.gz + - export AWS_ACCESS_KEY_ID=$MINIO_ACCESS_KEY + - export AWS_SECRET_ACCESS_KEY=$MINIO_SECRET_KEY + - export AWS_REGION=us-east-1 + - tusd -s3-endpoint http://localhost:9000 -s3-bucket myBucket & + + #Start Validate Api - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & + + #Start Policy Api - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & + + #Start Request Api + - NODE_ENV=test npm start & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + #Start FrontEnd + - cd /home/travis/build/bcgov/OCWA/frontend + - NODE_ENV=test yarn start & #Katalon requires OpenJDK 8 installed separately - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk @@ -112,6 +125,7 @@ env: - CXX=g++-4.8 - MONGODB=4.1.1 - KATALON_VERSION=5.9.0 + - TUSD_VERSION=0.11.0 - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - SONAR_APP=sonar-scanner - SONAR_VERSION=3.2.0.1227-linux From ee337417e4bc16df42d0e1858fcd02ba8ba5b307 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 14:34:51 -0800 Subject: [PATCH 142/226] fixed some yarn-y stuff in Travis and commented out more tricky tests --- .travis.yml | 10 +++++++--- .../scripts/groovy/Requester_step_def_ks.groovy | 16 ++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5a93f799..da89a4186 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,14 +62,14 @@ matrix: - NODE_ENV=test npm start & #Start Minio - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - wget --quiet https://dl.minio.io/server/minio/release/linux-amd64/minio - chmod +x minio - export MINIO_ACCESS_KEY="myKey" - export MINIO_SECRET_KEY="mySecret" - ./minio server /tmp & #Start TusD - - wget https://github.com/tus/tusd/releases/download/$TUSD_VERSION/tusd_linux_amd64.tar.gz + - wget --quiet https://github.com/tus/tusd/releases/download/$TUSD_VERSION/tusd_linux_amd64.tar.gz - export AWS_ACCESS_KEY_ID=$MINIO_ACCESS_KEY - export AWS_SECRET_ACCESS_KEY=$MINIO_SECRET_KEY - export AWS_REGION=us-east-1 @@ -92,11 +92,15 @@ matrix: - python3 wsgi.py & #Start Request Api - - NODE_ENV=test npm start & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/default.json.template config/default.json + - cp config/test.json.template config/test.json + - NODE_ENV=test npm start & #Start FrontEnd - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/default.json.template config/default.json + - yarn - NODE_ENV=test yarn start & #Katalon requires OpenJDK 8 installed separately diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index d71914ff5..333510c30 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -75,7 +75,7 @@ class Requester_step_def_ks { @Given("requester has started a request") def requester_starts_new_request() { - newRequestButtonObject = new TestObject("new-request-button") + /*newRequestButtonObject = new TestObject("new-request-button") newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) WebUI.waitForPageLoad(30) @@ -85,7 +85,7 @@ class Requester_step_def_ks { WebUI.click(newRequestButtonObject) request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) - WebUI.delay(2) + WebUI.delay(2)*/ } @Given("has not submitted the request") @@ -95,12 +95,12 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { - TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") + /*TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, "request-form-save-files-button", true) WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) TestObject uploadFileButton = new TestObject("fileUploadButton") - uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true) + uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true)*/ //WebUI.sendKeys(uploadFileButton, "C:\\\\Users\\PaulR\\\\Documents\\\\2 - Metadata\\\\HAS project\\\\hospital_visits_bc_2017.csv") //WebUI.sendKeys(uploadFileButton, findTestData('TestFile1')) //WebUI.sendKeys(uploadFileButton, '/Data Files/TestFile1')) @@ -126,9 +126,9 @@ def request_has_been_claimed_by_a_oc(){} @When("the requester saves their request") def requester_saves_new_request() { - requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + /*requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - WebUI.click(requestFormSaveCloseButtonObject) + WebUI.click(requestFormSaveCloseButtonObject)*/ } @When("requester submits their request") @@ -149,8 +149,8 @@ def requester_creates_a_new_comment(){ @Then("the requester should be able to re-open the request and pick up where they left off") def confirm_draft_save_was_successful() { - WebUI.waitForPageLoad(20) - WebUI.verifyTextPresent(request_name, false) +/* WebUI.waitForPageLoad(20) + WebUI.verifyTextPresent(request_name, false)*/ WebUI.closeBrowser() } From 10d02d2871ec4d927916d2ff2a15664c87fce471 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 14:53:16 -0800 Subject: [PATCH 143/226] open / delay / close browser test only --- ui_tests/.gitignore | 2 +- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 5 +++-- ui_tests/bin/lib/internal/test.txt | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 ui_tests/bin/lib/internal/test.txt diff --git a/ui_tests/.gitignore b/ui_tests/.gitignore index 8ce403b55..5541515b5 100644 --- a/ui_tests/.gitignore +++ b/ui_tests/.gitignore @@ -4,6 +4,6 @@ ReportFolder/* Profiles/default.glbl .classpath .settings -/bin/ +*.class Libs/TempTest*.groovy Libs/TempTemp*.groovy \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 333510c30..716f857d6 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -57,9 +57,10 @@ class Requester_step_def_ks { @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') + WebUI.delay(5) //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - WebUI.navigateToUrl("http://localhost:8000") + /*WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = new TestObject("app-auth-login-button") loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) WebUI.waitForElementClickable(loginButton, 30) @@ -69,7 +70,7 @@ class Requester_step_def_ks { WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login'))*/ } @Given("requester has started a request") diff --git a/ui_tests/bin/lib/internal/test.txt b/ui_tests/bin/lib/internal/test.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/ui_tests/bin/lib/internal/test.txt @@ -0,0 +1 @@ +test \ No newline at end of file From e9d12065c86049d182eab74468aac35c0a17c957 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 15:07:30 -0800 Subject: [PATCH 144/226] full Travis script --- .travis.yml | 392 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 391 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index da89a4186..93f893e96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,354 @@ addons: matrix: include: + - name: "Forum Api" + stage: "APIs" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + before_script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + - helm lint helm/forum-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Request Api" + stage: "APIs" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - npm install + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + - helm lint helm/request-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Policy Api" + stage: "APIs" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - helm lint helm/policy-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Validation Api" + stage: "APIs" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - helm lint helm/validate-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Scan - Python" + stage: "Tests" + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1 -m pytest + - sudo coverage xml + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi + + - name: "Scan - NodeJS" + stage: "Tests" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + + before_script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + + - cd /home/travis/build/bcgov/OCWA/frontend + - npm test + + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi + + - name: "OCWA Master Helm Chart" + stage: "Tests" + language: node_js + node_js: + - "node" + cache: npm + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa - name: "Integration Tests" stage: "Tests" @@ -117,7 +465,49 @@ matrix: - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" - + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + env: global: - HELM_URL=https://storage.googleapis.com/kubernetes-helm From 895ad14713e4188dc504aa0f749cc71ecf1fb149 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 21 Dec 2018 15:29:21 -0800 Subject: [PATCH 145/226] fixed yaml syntax error --- .travis.yml | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93f893e96..79efa2915 100644 --- a/.travis.yml +++ b/.travis.yml @@ -465,49 +465,47 @@ matrix: - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" - - name: "Front End" - stage: "Frontend" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ env: global: - HELM_URL=https://storage.googleapis.com/kubernetes-helm From 8850f30e08f9eccefc1888ae5bedd18b24785d5c Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 31 Dec 2018 10:47:26 -0800 Subject: [PATCH 146/226] created test files for upload file testing --- .../features/requester/draft_requests.feature | 30 ++-- .../requester/view_request_details.feature | 14 +- .../groovy/Requester_step_def_ks.groovy | 155 ++++++++++-------- ui_tests/Profiles/Travis.glbl | 34 ++-- .../Script1545256102660.groovy | 2 +- ui_tests/bin/lib/internal/test.txt | 1 - ui_tests/testfile1.csv | 4 + ui_tests/testfile2.csv | 4 + 8 files changed, 139 insertions(+), 105 deletions(-) delete mode 100644 ui_tests/bin/lib/internal/test.txt create mode 100644 ui_tests/testfile1.csv create mode 100644 ui_tests/testfile2.csv diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature index cbe142827..681dd4637 100644 --- a/ui_tests/Include/features/requester/draft_requests.feature +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -1,16 +1,16 @@ -Feature: Draft requests -As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once - Background: - Given requester has logged in - Scenario: Save a draft request (no files) - And requester has started a request - But has not submitted the request - When the requester saves their request - Then the requester should be able to re-open the request and pick up where they left off - - Scenario: Save a draft request (with files) - And requester has started a request - And requester add output files to the request - But has not submitted the request - When the requester saves their request +Feature: Draft requests +As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once + Background: + Given requester has logged in + Scenario: Save a draft request (no files) + And requester has started a request + And requester add output files to the request + But has not submitted the request + When the requester saves their request + Then the requester should be able to re-open the request and pick up where they left off + + Scenario: Save a draft request (with files) + And requester has started a request + But has not submitted the request + When the requester saves their request Then the requester should be able to re-open the request and pick up where they left off \ No newline at end of file diff --git a/ui_tests/Include/features/requester/view_request_details.feature b/ui_tests/Include/features/requester/view_request_details.feature index d7ad2b06b..79f4a2669 100644 --- a/ui_tests/Include/features/requester/view_request_details.feature +++ b/ui_tests/Include/features/requester/view_request_details.feature @@ -1,7 +1,7 @@ -Feature: View request details -As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions - Scenario: View details of a request - Given requester has logged in - And the requester has submitted a request - When the requester views the request - Then the requester should see the complete record of the request (including export files, supporting files/text, discussion, and status changes) \ No newline at end of file +Feature: View request details +As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions + Scenario: View details of a request + Given requester has logged in + And the requester has submitted a request + When the requester views the request + Then the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 716f857d6..689aa3774 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -59,8 +59,8 @@ class Requester_step_def_ks { WebUI.openBrowser('') WebUI.delay(5) - //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - /*WebUI.navigateToUrl("http://localhost:8000") + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + //WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = new TestObject("app-auth-login-button") loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) WebUI.waitForElementClickable(loginButton, 30) @@ -70,13 +70,13 @@ class Requester_step_def_ks { WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') - WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login'))*/ + WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } @Given("requester has started a request") def requester_starts_new_request() { - /*newRequestButtonObject = new TestObject("new-request-button") + newRequestButtonObject = new TestObject("new-request-button") newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) WebUI.waitForPageLoad(30) @@ -86,7 +86,7 @@ class Requester_step_def_ks { WebUI.click(newRequestButtonObject) request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) - WebUI.delay(2)*/ + WebUI.delay(2) } @Given("has not submitted the request") @@ -96,74 +96,91 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { - /*TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") + TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, "request-form-save-files-button", true) WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) TestObject uploadFileButton = new TestObject("fileUploadButton") - uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true)*/ - //WebUI.sendKeys(uploadFileButton, "C:\\\\Users\\PaulR\\\\Documents\\\\2 - Metadata\\\\HAS project\\\\hospital_visits_bc_2017.csv") - //WebUI.sendKeys(uploadFileButton, findTestData('TestFile1')) - //WebUI.sendKeys(uploadFileButton, '/Data Files/TestFile1')) - //WebUI.delay(5) + uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true) + WebUI.sendKeys(uploadFileButton, GlobalVariable.TestFile1Path.toString()) + + WebUI.delay(5) + + } + + @Given("the output files do not violate any blocking rules") + def output_files_do_not_violate_blocking_rules(){} + + @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") + def requester_affirms_output_is_safe() { + } + + @Given("the requester has submitted a request") + def request_has_submitted_a_request(){ + requester_starts_new_request() + requester_adds_output_files() + requester_submits_request() } -@Given("the output files do not violate any blocking rules") -def output_files_do_not_violate_blocking_rules(){} - -@Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") -def requester_affirms_output_is_safe() { -} - -@Given("requester has a submitted request") -def request_has_submitted_a_request(){ - requester_starts_new_request() - requester_adds_output_files() - requester_submits_request() -} - -@Given("the request has been claimed by an output checker") -def request_has_been_claimed_by_a_oc(){} - -@When("the requester saves their request") -def requester_saves_new_request() { - /*requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - WebUI.click(requestFormSaveCloseButtonObject)*/ -} - -@When("requester submits their request") -def requester_submits_request() { - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) -} - -@When("requester writes and submits a new comment") -def requester_creates_a_new_comment(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) - - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) - - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') -} - -@Then("the requester should be able to re-open the request and pick up where they left off") -def confirm_draft_save_was_successful() { -/* WebUI.waitForPageLoad(20) - WebUI.verifyTextPresent(request_name, false)*/ - WebUI.closeBrowser() -} - -@Then("the requester's request is put in awaiting review") -def confirm_request_is_in_awaiting_review_state(){ - WebUI.verifyTextPresent("Awaiting review", false) - WebUI.closeBrowser() -} - -@Then("the requester should not be able to submit the request") -def requester_is_not_able_to_submit_request(){ - WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) - WebUI.closeBrowser() -} + @Given("the request has been claimed by an output checker") + def request_has_been_claimed_by_a_oc(){} + + @When("the requester saves their request") + def requester_saves_new_request() { + requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") + requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) + WebUI.click(requestFormSaveCloseButtonObject) + } + + @When("requester submits their request") + def requester_submits_request() { + TestObject requestFormSaveButtonObject = new TestObject("request-form-save-close-button") + requestFormSaveButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-button", true) + WebUI.click(requestFormSaveButtonObject) + WebUI.delay(5) + WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + WebUI.delay(3) + } + + @When("requester writes and submits a new comment") + def requester_creates_a_new_comment(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) + + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') + } + + @When("the requester views the request") + def requester_views_request_they_created(){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + } + + @Then("the requester should be able to re-open the request and pick up where they left off") + def confirm_draft_save_was_successful() { + WebUI.waitForPageLoad(20) + WebUI.verifyTextPresent(request_name, false) + WebUI.closeBrowser() + } + + @Then("the requester's request is put in awaiting review") + def confirm_request_is_in_awaiting_review_state(){ + WebUI.verifyTextPresent("Awaiting review", false) + WebUI.closeBrowser() + } + + @Then("the requester should not be able to submit the request") + def requester_is_not_able_to_submit_request(){ + WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + WebUI.closeBrowser() + } + + @Then("the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes") + def submitted_request_info_matches_what_was_submitted(){ + WebUI.delay(5) + WebUI.closeBrowser() + } } \ No newline at end of file diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index feb3f8808..8904fd6f4 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -1,12 +1,22 @@ - - - - Travis - - false - - - 'http://localhost:8000' - OCWA_URL - - + + + + Travis + + false + + + 'http://localhost:8000' + OCWA_URL + + + + '/home/travis/build/bcgov/OCWA/ui_tests/testfile1.csv' + TestFile1Path + + + + '/home/travis/build/bcgov/OCWA/ui_tests/testfile2.csv' + TestFile2Path + + diff --git a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy index 06baecc91..12a0ad242 100644 --- a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy +++ b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy @@ -17,5 +17,5 @@ CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') not_run: CucumberKW.runFeatureFile('Include/features/requester/create_a_new_request.feature') -//WebUI.uploadFile(findTestObject(null), findTestData('TestFile1').getValue(1, 1)) +not_run: CucumberKW.runFeatureFile('Include/features/requester/view_request_details.feature') diff --git a/ui_tests/bin/lib/internal/test.txt b/ui_tests/bin/lib/internal/test.txt deleted file mode 100644 index 30d74d258..000000000 --- a/ui_tests/bin/lib/internal/test.txt +++ /dev/null @@ -1 +0,0 @@ -test \ No newline at end of file diff --git a/ui_tests/testfile1.csv b/ui_tests/testfile1.csv new file mode 100644 index 000000000..40599af91 --- /dev/null +++ b/ui_tests/testfile1.csv @@ -0,0 +1,4 @@ +Project Entity ID,Accident type,Accident Date +3d3bc539-9aec-45e0-96a3-4e851068d5e2,motor vehicle,2/26/2018 +2fc94c19-78d8-42a4-8e1a-0d8103340c72,recreational sport,3/15/2018 +a4832b32-25ac-41fc-96ca-7be5753b98b8,motor vehicle,4/22/2018 diff --git a/ui_tests/testfile2.csv b/ui_tests/testfile2.csv new file mode 100644 index 000000000..499fa65bc --- /dev/null +++ b/ui_tests/testfile2.csv @@ -0,0 +1,4 @@ +Project Entity ID,Hospital Number,Fiscal Year,Province Issuing Health Care Number,Gender,Age in Years,Local Health Area,Triage date/time,Triage Level,Registration Date/Time,Physician Initial Assessment Date/Time,Disposition Date/Time +3d3bc539-9aec-45e0-96a3-4e851068d5e2,111,2017,BC,M,23,Victoria,2017-10-20T21:32:52,5,2018-02-26T21:32:52,2018-02-26T23:32:52,2018-02-26T23:32:52 +a4832b32-25ac-41fc-96ca-7be5753b98b8,121,2017,BC,F,47,Kelowna,2017-11-26T21:32:53,4,2018-02-26T21:32:53,2018-02-26T23:32:53,2018-02-26T23:32:53 +2fc94c19-78d8-42a4-8e1a-0d8103340c72,134,2017,BC,F,62,Vancouver,2017-12-23T21:32:54,5,2018-02-26T21:32:54,2018-02-26T23:32:54,2018-02-26T23:32:54 From e47f0f09d9e1082b81298e2db9534f86f1508923 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 2 Jan 2019 13:20:58 -0800 Subject: [PATCH 147/226] built out test cases / refactored code --- .../requester/canceling_request.feature | 17 +- .../requester/create_a_new_request.feature | 74 +++--- .../edit_previously_submitted_request.feature | 16 +- .../features/requester/notifications.feature | 44 ++-- .../requester/request_discussion.feature | 28 +- .../requester/see_requests_by_status.feature | 34 +-- .../requester/view_request_details.feature | 3 +- .../requester/withdrawing_request.feature | 12 + .../groovy/Requester_step_def_ks.groovy | 243 +++++++++++++++--- .../random_test_request_name.groovy | 2 +- ui_tests/Libs/internal/GlobalVariable.groovy | 16 +- .../input_Password_login.rs | 2 +- .../input_Password_password.rs | 2 +- .../input_Username or email_userna.rs | 2 +- .../span_Cancelled.rs | 72 ++++++ .../span_Denied.rs | 72 ++++++ .../span_Draft.rs | 72 ++++++ .../span_Flagged.rs | 72 ++++++ .../span_Login.rs | 54 ++++ .../span_QueuedIn Review.rs | 72 ++++++ ui_tests/Profiles/Travis.glbl | 13 +- 21 files changed, 765 insertions(+), 157 deletions(-) create mode 100644 ui_tests/Include/features/requester/withdrawing_request.feature create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Cancelled.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Denied.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Draft.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Flagged.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_Login.rs create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/span_QueuedIn Review.rs diff --git a/ui_tests/Include/features/requester/canceling_request.feature b/ui_tests/Include/features/requester/canceling_request.feature index a54c7dbbb..f1a758918 100644 --- a/ui_tests/Include/features/requester/canceling_request.feature +++ b/ui_tests/Include/features/requester/canceling_request.feature @@ -1,7 +1,12 @@ -Feature: Canceling a request -As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed - Scenario: Cancel a request - Given requester has logged in - And requester has a request that is "Awaiting review" or "Review in progress" - When the requester cancels the request +Feature: Canceling a request +As an requester I want to be able to cancel my request so that I can let checkers know that my request is no longer something I want reviewed + Scenario: Cancel a request that is awaiting review + Given requester has logged in + And requester has a request of status "Awaiting review" + When the requester cancels the request + Then the request status is changed to "Work in Progress" + Scenario: Cancel a request that is in the process of being reviewed + Given requester has logged in + And requester has a request of status "Review in progress" + When the requester cancels the request Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui_tests/Include/features/requester/create_a_new_request.feature b/ui_tests/Include/features/requester/create_a_new_request.feature index 3b4fdc527..edb22a6f3 100644 --- a/ui_tests/Include/features/requester/create_a_new_request.feature +++ b/ui_tests/Include/features/requester/create_a_new_request.feature @@ -1,39 +1,37 @@ -Feature: create a new request - As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment - Background: - Given requester has logged in - And requester has started a request - And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge - Scenario: A valid request - Given the output files do not violate any blocking rules - When requester submits their request - Then the requester's request is put in awaiting review - Scenario: A request has no data - Given requester does not provide any data they wish to export - When requester submits their request - Then the requester should not be able to submit the request - - Scenario Outline: A request violates blocking rule - Given a request violates blocking rule: - When requester submits their request - Then requester should not be able to submit the request - And the requester should be informed that has been violated - - Examples: - | blocking_rule | - | A request that has a file that is too big | - | The summation of all export file sizes exceeds the request file size limit | - | An export file has a blocked file extension | - | A request has a file with a StudyID in it | - - Scenario Outline: A request violates warning rule - Given a request violates blocking rule: - When requester submits their request - Then requester should be able to submit the request - And the requester should be informed that has been violated - - Examples: - | warning_rule | - | A request that has a file that exceeds the file size warning threshold | - | The summation of all export file sizes exceeds the request file size warning threshold | +Feature: create a new request + As an requester I want to be able to submit my output (and associated metadata) for review so that I can start the process of getting my outputs out of the secure environment + Background: + Given requester has logged in + And requester has started a request + And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge + Scenario: A valid request + Given the output files do not violate any blocking rules + When requester submits their request + Then the request status is changed to "Awaiting review" + Scenario: A request has no data + Then the requester should not be able to submit the request + + Scenario Outline: A request violates blocking rule + Given request violates given blocking rule + When requester submits their request + Then the requester should not be able to submit the request + And requester should be informed that given blocking rule has been violated + + Examples: + | blocking_rule | + | A request that has a file that is too big | + | The summation of all export file sizes exceeds the request file size limit | + | An export file has a blocked file extension | + | A request has a file with a StudyID in it | + + Scenario Outline: A request violates warning rule + Given request violates given warning rule + When requester submits their request + Then the requester should be able to submit the request + And requester should be informed that given warning rule has been violated + + Examples: + | warning_rule | + | A request that has a file that exceeds the file size warning threshold | + | The summation of all export file sizes exceeds the request file size warning threshold | | An export file has a warning file extension | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature index 05dcde51b..37f532ae2 100644 --- a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature +++ b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature @@ -1,8 +1,8 @@ -Feature: edit a previously submitted request -As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request - Scenario: Edit a request that has been reviewed by an output checker and needs revisions - Given requester has logged in - And requester the request is "Work in Progress" - When the requester views the request - Then the requester should be able to make changes to the request - And re-submit the request \ No newline at end of file +Feature: edit a previously submitted request +As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request + Scenario: Edit a request that has been reviewed by an output checker and needs revisions + Given requester has logged in + And requester has a request of status "Work in Progress" + When the requester views the request + Then requester should be able to make changes to the request + And requester should be able to re-submit the request \ No newline at end of file diff --git a/ui_tests/Include/features/requester/notifications.feature b/ui_tests/Include/features/requester/notifications.feature index e0c0df1fd..375deef8f 100644 --- a/ui_tests/Include/features/requester/notifications.feature +++ b/ui_tests/Include/features/requester/notifications.feature @@ -1,23 +1,23 @@ -Feature: Notifications -As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action - - Scenario Outline: requester notifications - Given requester has a submitted request - When occurs - Then the requester should receive an email notifying them of the - But the email should not contain specifics of the request - Examples: - | event | - | output checker makes a comment on the request | - | output checker approves the request | - | output checker requests revisions the request | - - Scenario Outline: output checker notifications - Given an output checker has currently claimed a request - When occurs - Then the output checker should receive an email notifying them of the - But the email should not contain specifics of the request - Examples: - | event | - | requester makes a comment on the request | +Feature: Notifications +As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action + + Scenario Outline: requester notifications + Given requester has submitted a request + When occurs + Then the requester should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | output checker makes a comment on the request | + | output checker approves the request | + | output checker requests revisions the request | + + Scenario Outline: output checker notifications + Given an output checker has currently claimed a request + When occurs + Then the output checker should receive an email notifying them of the + But the email should not contain specifics of the request + Examples: + | event | + | requester makes a comment on the request | | requester re-submits a request | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/request_discussion.feature b/ui_tests/Include/features/requester/request_discussion.feature index f6aff55b7..52e50d7c3 100644 --- a/ui_tests/Include/features/requester/request_discussion.feature +++ b/ui_tests/Include/features/requester/request_discussion.feature @@ -1,15 +1,15 @@ -Feature: Discussion about a request - As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request - As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request - Scenario: requester adds a new comment about request - Given requester has logged in - And requester has a submitted request - And the request has been claimed by an output checker - When requester writes and submits a new comment - Then the requester should see their new comment displayed - And the output checker assigned to the request should be notified of the new comment - Scenario: Output checker adds a new comment about request - Given output checker has logged in - When output checker writes and submits a new comment - Then the output checker should see their new comment displayed +Feature: Discussion about a request + As an requester I want to be able to discuss my outputs with output checkers so that I can answer questions the output checker may have about my request + As an output checker I want to be able to discuss a request with the requester that submitted it so that I can better understand how to adjudicate the request + Scenario: requester adds a new comment about request + Given requester has logged in + And requester has submitted a request + And the request has been claimed by an output checker + When requester writes and submits a new comment + Then requester should see their new comment displayed + And the output checker assigned to the request should be notified of the new comment + Scenario: Output checker adds a new comment about request + Given output checker has logged in + When output checker writes and submits a new comment + Then the output checker should see their new comment displayed And the requester(s) associated to the request should be notified of the new comment \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_requests_by_status.feature b/ui_tests/Include/features/requester/see_requests_by_status.feature index 14c8c5bc5..e011181c0 100644 --- a/ui_tests/Include/features/requester/see_requests_by_status.feature +++ b/ui_tests/Include/features/requester/see_requests_by_status.feature @@ -1,18 +1,18 @@ -Feature: See requester's requests by status -As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review - Scenario Outline: View requests - Given requester has logged in - And the requester has an request - And request was last updated within the last month - When requester views requests - Then requests should be displayed - But requests with updates older than a month should not be displayed - - Examples: - | status | filter | - | Approved | Approved | - | Revisions required | Draft | - | Awaiting review | Submitted | - | Review in progress | Submitted | - | Draft | Draft | +Feature: See requester's requests by status +As an requester I want to be able to see a history of my requests so that I can have a record of what I submitted for review + Scenario Outline: View requests + Given requester has logged in + And requester has a request of status "" + And request was last updated within the last month + When requester views requests + Then requests of status "" should be displayed + But requests with updates older than a month should not be displayed + + Examples: + | status | filter | + | Approved | Approved | + | Revisions required | Draft | + | Awaiting review | Submitted | + | Review in progress | Submitted | + | Draft | Draft | | Work in progress | Draft | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/view_request_details.feature b/ui_tests/Include/features/requester/view_request_details.feature index 79f4a2669..99b7a7944 100644 --- a/ui_tests/Include/features/requester/view_request_details.feature +++ b/ui_tests/Include/features/requester/view_request_details.feature @@ -2,6 +2,7 @@ Feature: View request details As an requester I want to be able to see the contents of request I've made so that I have a record of my submissions Scenario: View details of a request Given requester has logged in - And the requester has submitted a request + And requester has submitted a request + And requester writes and submits a new comment When the requester views the request Then the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes \ No newline at end of file diff --git a/ui_tests/Include/features/requester/withdrawing_request.feature b/ui_tests/Include/features/requester/withdrawing_request.feature new file mode 100644 index 000000000..1fbbf2107 --- /dev/null +++ b/ui_tests/Include/features/requester/withdrawing_request.feature @@ -0,0 +1,12 @@ +Feature: Withdrawing a request +As an requester I want to be able to withdraw my request so that I can let checkers know that my request is no longer something I want reviewed + Scenario: Withdraw a request that is awaiting review + Given requester has logged in + And requester has a request of status "Awaiting review" + When the requester withdraws the request + Then the request status is changed to "Work in Progress" + Scenario: Withdraw a request that is in the process of being reviewed + Given requester has logged in + And requester has a request of status "Review in progress" + When the requester withdraws the request + Then the request status is changed to "Work in Progress" \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 689aa3774..ad86d2801 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -47,10 +47,28 @@ import cucumber.api.java.en.When class Requester_step_def_ks { - String request_name = '' - TestObject newRequestButtonObject = null - TestObject requestFormSaveCloseButtonObject = null - + final String TEST_COMMENT = "test" + final String PURPOSE_TEXT = "The purpose of my project is X" + final String EDITED_PURPOSE_TEXT = "Edited the purpose to be Y" + final String REQUEST_PATH = "/requests/" + final String LOGIN_BTN_ID = "app-auth-login-button" + final String LOGIN_USERNAME = "pripley" + final String LOGIN_PWD = "EUKVYWz2orI=" + final String NEW_REQUEST_BTN_ID = "new-request-button" + final String REQUEST_SAVE_FILES_BTN_ID = "request-form-save-files-button" + final String REQUEST_FILES_UPLOAD_BTN_ID = "file-uploader-input" + final String REQUEST_SAVE_BTN_ID = "request-form-save-button" + final String REQUEST_SAVE_CLOSE_BTN_ID = "request-form-save-close-button" + final String REQUEST_EDIT_BTN_ID = "request-sidebar-edit-button" + final String REQUEST_PURPOSE_TXT_ID = "purpose" + final String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" + final String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" + + String g_requestName = "" + TestObject g_newRequestButtonObject = null + TestObject g_requestFormSaveCloseButtonObject = null + String g_fileToUpload = "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name" + /** * The step definitions below match with Katalon sample Gherkin steps */ @@ -61,14 +79,14 @@ class Requester_step_def_ks { WebUI.navigateToUrl(GlobalVariable.OCWA_URL) //WebUI.navigateToUrl("http://localhost:8000") - TestObject loginButton = new TestObject("app-auth-login-button") - loginButton.addProperty("id", ConditionType.EQUALS, "app-auth-login-button", true) + TestObject loginButton = new TestObject(LOGIN_BTN_ID) + loginButton.addProperty("id", ConditionType.EQUALS, LOGIN_BTN_ID, true) WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) - WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), 'pripley') + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), LOGIN_USERNAME) - WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), 'EUKVYWz2orI=') + WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), LOGIN_PWD) WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } @@ -76,16 +94,21 @@ class Requester_step_def_ks { @Given("requester has started a request") def requester_starts_new_request() { - newRequestButtonObject = new TestObject("new-request-button") - newRequestButtonObject.addProperty("id", ConditionType.EQUALS, "new-request-button", true) + g_newRequestButtonObject = new TestObject(NEW_REQUEST_BTN_ID) + g_newRequestButtonObject.addProperty("id", ConditionType.EQUALS, NEW_REQUEST_BTN_ID, true) + + TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) + purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) WebUI.waitForPageLoad(30) WebUI.delay(5) - WebUI.waitForElementClickable(newRequestButtonObject, 30) - WebUI.click(newRequestButtonObject) - request_name = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), request_name) + WebUI.waitForElementClickable(g_newRequestButtonObject, 30) + WebUI.click(g_newRequestButtonObject) + g_requestName = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), g_requestName) + + WebUI.setText(purposeTextbox, PURPOSE_TEXT) WebUI.delay(2) } @@ -96,13 +119,13 @@ class Requester_step_def_ks { @Given("requester add output files to the request") def requester_adds_output_files() { - TestObject requestFormSaveFilesButton = new TestObject("request-form-save-files-button") - requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, "request-form-save-files-button", true) + TestObject requestFormSaveFilesButton = new TestObject(REQUEST_SAVE_FILES_BTN_ID) + requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_FILES_BTN_ID, true) WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) - TestObject uploadFileButton = new TestObject("fileUploadButton") - uploadFileButton.addProperty("id", ConditionType.EQUALS, "file-uploader-input", true) - WebUI.sendKeys(uploadFileButton, GlobalVariable.TestFile1Path.toString()) + TestObject uploadFileButton = new TestObject(REQUEST_FILES_UPLOAD_BTN_ID) + uploadFileButton.addProperty("id", ConditionType.EQUALS, REQUEST_FILES_UPLOAD_BTN_ID, true) + WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name") WebUI.delay(5) @@ -110,34 +133,84 @@ class Requester_step_def_ks { @Given("the output files do not violate any blocking rules") def output_files_do_not_violate_blocking_rules(){} + + @Given("request violates given warning rule (.+)") + def request_violates_warning_rule(String warningRule){ +// switch (warningRule) { +// case "": +// +// break +// } + } + @Given("request violates given blocking rule (.+)") + def request_violates_blocking_rule(String blockingRule){ +// switch (blockingRule) { +// case "": +// +// break +// } + } @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") def requester_affirms_output_is_safe() { } - @Given("the requester has submitted a request") - def request_has_submitted_a_request(){ + @Given("requester has submitted a request") + def requester_has_submitted_a_request(){ requester_starts_new_request() requester_adds_output_files() requester_submits_request() } + + @Given("request was last updated within the last month") + def request_updated_within_last_month() {} @Given("the request has been claimed by an output checker") - def request_has_been_claimed_by_a_oc(){} + def request_has_been_claimed_by_a_oc(){ + //request_is_review_in_progress() + requester_has_a_request_of_status("Review in progress") + } + + @Given('requester has a request of status "(.+)"') + def requester_has_a_request_of_status(String status) { + switch (status) { + case "Draft": + requester_starts_new_request() + requester_adds_output_files() + requester_saves_new_request() + break + case "Awaiting review": + requester_has_submitted_a_request() + break + case "Review in progress": + requester_has_submitted_a_request() + //output checker needs to claim + break + case "Work in progress": + requester_has_submitted_a_request() + requester_withdraws_request() + break + case "Approved": + requester_has_submitted_a_request() + //output checker needs to claim + //output checker needs to approve + break + } + } @When("the requester saves their request") def requester_saves_new_request() { - requestFormSaveCloseButtonObject = new TestObject("request-form-save-close-button") - requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-close-button", true) - WebUI.click(requestFormSaveCloseButtonObject) + g_requestFormSaveCloseButtonObject = new TestObject(REQUEST_SAVE_CLOSE_BTN_ID) + g_requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_CLOSE_BTN_ID, true) + WebUI.click(g_requestFormSaveCloseButtonObject) } @When("requester submits their request") def requester_submits_request() { - TestObject requestFormSaveButtonObject = new TestObject("request-form-save-close-button") - requestFormSaveButtonObject.addProperty("id", ConditionType.EQUALS, "request-form-save-button", true) + TestObject requestFormSaveButtonObject = new TestObject(REQUEST_SAVE_BTN_ID) + requestFormSaveButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_BTN_ID, true) WebUI.click(requestFormSaveButtonObject) - WebUI.delay(5) + WebUI.delay(15) WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) WebUI.delay(3) @@ -145,30 +218,54 @@ class Requester_step_def_ks { @When("requester writes and submits a new comment") def requester_creates_a_new_comment(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) - + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) - + WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), TEST_COMMENT) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) - - WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), '



') } @When("the requester views the request") def requester_views_request_they_created(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL + "/requests/" + request_name) + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") } + + @When("the requester cancels the request") + def requester_cancels_request(){ + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + TestObject cancelButtonObject = new TestObject(REQUEST_CANCEL_BTN_ID) + cancelButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_CANCEL_BTN_ID, true) + WebUI.click(cancelButtonObject) + } + + @When("the requester withdraws the request") + def requester_withdraws_request(){ + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + TestObject withdrawButtonObject = new TestObject(REQUEST_WITHDRAW_BTN_ID) + withdrawButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_WITHDRAW_BTN_ID, true) + WebUI.click(withdrawButtonObject) + } + + @When("requester views (.+) requests") + def requester_views_requests_of_given_status(String status){ + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + switch (status) { + case "Draft": + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Draft')) + break + case "Submitted": + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_QueuedIn Review')) + break + case "Approved": + //stub for when a filter for approved requests is added to UI + break + } + } + @Then("the requester should be able to re-open the request and pick up where they left off") def confirm_draft_save_was_successful() { WebUI.waitForPageLoad(20) - WebUI.verifyTextPresent(request_name, false) - WebUI.closeBrowser() - } - - @Then("the requester's request is put in awaiting review") - def confirm_request_is_in_awaiting_review_state(){ - WebUI.verifyTextPresent("Awaiting review", false) + WebUI.verifyTextPresent(g_requestName, false) WebUI.closeBrowser() } @@ -178,9 +275,73 @@ class Requester_step_def_ks { WebUI.closeBrowser() } + @Then("the requester should be able to submit the request") + def requester_is_able_to_submit_request(){ + WebUI.verifyElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + WebUI.closeBrowser() + } + @Then("the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes") def submitted_request_info_matches_what_was_submitted(){ + WebUI.verifyTextPresent(GlobalVariable.TestFile1Path.toString(), false) + WebUI.verifyTextPresent(g_requestName, false) + WebUI.verifyTextPresent(g_purpose, false) + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) + WebUI.delay(2) + //WebUI.verifyTextPresent(TEST_COMMENT, false) + requester_should_see_their_new_comment_displayed() WebUI.delay(5) WebUI.closeBrowser() } + + @Then('the request status is changed to "(.+)"') + def request_should_be_in_given_status(String status){ + //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + WebUI.verifyTextPresent(status, false) + WebUI.closeBrowser() + } + + @Then('requests of status "(.+)" should be displayed') + def requests_of_given_status_should_be_displayed(String status){ + WebUI.verifyTextPresent(g_requestName, false) + WebUI.closeBrowser() + } + + @Then("requests with updates older than a month should not be displayed") + def no_old_requests_should_be_displayed(){} + + @Then("requester should see their new comment displayed") + def requester_should_see_their_new_comment_displayed(){ + WebUI.verifyTextPresent(TEST_COMMENT, false) + } + + @Then("requester should be able to make changes to the request") + def requester_should_be_able_to_make_changes_to_the_request(){ + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + TestObject editButtonObject = new TestObject("edit-button") + editButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_EDIT_BTN_ID, true) + WebUI.click(editButtonObject) + TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) + purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) + WebUI.setText(purposeTextbox, EDITED_PURPOSE_TEXT) + } + @Then("requester should be able to re-submit the request") + def requester_should_be_able_to_resubmit_request(){ + WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) + WebUI.delay(5) + request_should_be_in_given_status("Review in progress") + WebUI.closeBrowser() + } + + @Then("requester should be informed that given blocking rule (.+) has been violated") + def request_should_be_informed_of_blocking_rule_violation(){ + //unclear how this is displayed in the UI + } + + @Then("requester should be informed that given warning rule (.+) has been violated") + def request_should_be_informed_of_warning_rule_violation(){ + //unclear how this is displayed in the UI + } + } \ No newline at end of file diff --git a/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy b/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy index c63222c61..ea41488a8 100644 --- a/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy +++ b/ui_tests/Keywords/test_OCWA_keywords/random_test_request_name.groovy @@ -24,6 +24,6 @@ public class random_test_request_name { def gen_random_test_request_name() { Date today = new Date() String todaysDate = today.format('MMddyy-hhmm-ss') - return 'auto_eng ' + todaysDate + return 'auto_eng' + todaysDate } } \ No newline at end of file diff --git a/ui_tests/Libs/internal/GlobalVariable.groovy b/ui_tests/Libs/internal/GlobalVariable.groovy index 51b9af8e5..7865384f0 100644 --- a/ui_tests/Libs/internal/GlobalVariable.groovy +++ b/ui_tests/Libs/internal/GlobalVariable.groovy @@ -18,16 +18,28 @@ public class GlobalVariable { */ public static Object OCWA_URL + /** + *

+ */ + public static Object TestFile1Path + + /** + *

+ */ + public static Object TestFile2Path + static { def allVariables = [:] - allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca']) - allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000']) + allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca', 'TestFile1Path' : 'C:\\\\\\\\Users\\\\PaulR\\\\\\\\Documents\\\\\\\\2 - Metadata\\\\\\\\HAS project\\\\\\\\hospital_visits_bc_2017.csv', 'TestFile2Path' : 'C:\\\\\\\\Users\\\\PaulR\\\\\\\\Documents\\\\\\\\2 - Metadata\\\\\\\\HAS project\\\\\\\\sports_accidents_bc_2017.csv']) + allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000', 'TestFile1Path' : '/home/travis/build/bcgov/OCWA/ui_tests/testfile1.csv', 'TestFile2Path' : '/home/travis/build/bcgov/OCWA/ui_tests/testfile2.csv']) String profileName = RunConfiguration.getExecutionProfile() def selectedVariables = allVariables[profileName] OCWA_URL = selectedVariables['OCWA_URL'] + TestFile1Path = selectedVariables['TestFile1Path'] + TestFile2Path = selectedVariables['TestFile2Path'] } } diff --git a/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs index e4f34d42a..cfcccdc89 100644 --- a/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_login.rs @@ -10,7 +10,7 @@ //input[@id='kc-login'] - BASIC + XPATH false true diff --git a/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs index 4b818c9f3..87dae4354 100644 --- a/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Password_password.rs @@ -10,7 +10,7 @@ //input[@id='password'] - BASIC + XPATH false true diff --git a/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs b/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs index 6f517919f..1b9d94834 100644 --- a/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs +++ b/ui_tests/Object Repository/Page_Log in to ocwa/input_Username or email_userna.rs @@ -10,7 +10,7 @@ //input[@id='username'] - BASIC + XPATH false true diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Cancelled.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Cancelled.rs new file mode 100644 index 000000000..5edb379ef --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Cancelled.rs @@ -0,0 +1,72 @@ + + + + span_Cancelled + + 67dcebb3-f537-46fb-b692-3e736a0cdef4 + + + XPATH + //nav[@id='requests-list-filters']/div/div[6]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Cancelled + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[6]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Status'])[1]/preceding::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Request Identifier'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[6]/button/span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Denied.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Denied.rs new file mode 100644 index 000000000..66da5d33b --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Denied.rs @@ -0,0 +1,72 @@ + + + + span_Denied + + beff2871-1fd7-4986-949c-e0aeeb041319 + + + XPATH + //nav[@id='requests-list-filters']/div/div[5]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Denied + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[5]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancelled'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Status'])[1]/preceding::span[4] + + + false + equals + xpath:position + //div[5]/button/span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Draft.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Draft.rs new file mode 100644 index 000000000..fe12b2600 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Draft.rs @@ -0,0 +1,72 @@ + + + + span_Draft + + eed336c2-2db7-4c7b-9b95-2e5ca8f147ec + + + XPATH + //nav[@id='requests-list-filters']/div/div[2]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Draft + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[2]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='My Requests'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[2]/button/span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Flagged.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Flagged.rs new file mode 100644 index 000000000..8b563a242 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Flagged.rs @@ -0,0 +1,72 @@ + + + + span_Flagged + + 3d8643ef-b121-486d-ac62-00a94ea7e89a + + + XPATH + //nav[@id='requests-list-filters']/div/div[4]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Flagged + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[4]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Queued/In Review'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Cancelled'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[4]/button/span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Login.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Login.rs new file mode 100644 index 000000000..ec9e5f3a7 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Login.rs @@ -0,0 +1,54 @@ + + + + span_Login + + 0766ca22-31d9-4634-a0fc-7c54a2edd801 + + + XPATH + //a[@id='app-auth-login-button']/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Login + + + false + equals + xpath + Main + id("app-auth-login-button")/span[1]/span[1] + + + true + equals + xpath:idRelative + //a[@id='app-auth-login-button']/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)=concat('id(', '"', 'app-auth-login-button', '"', ')/span[1]/span[1]')])[1]/preceding::span[1] + + + false + equals + xpath:position + //span/span + + diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_QueuedIn Review.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_QueuedIn Review.rs new file mode 100644 index 000000000..227bc5f70 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_QueuedIn Review.rs @@ -0,0 +1,72 @@ + + + + span_QueuedIn Review + + 0336bccd-6598-481e-a5b0-f01eae35c4da + + + XPATH + //nav[@id='requests-list-filters']/div/div[3]/button/span/span + + + XPATH + false + + true + equals + tag + Main + span + + + true + equals + text + Main + Queued/In Review + + + false + equals + xpath + Main + id("requests-list-filters")/div[@class="sc-gzVnrw dlVKOv"]/div[@class="sc-htoDjs etChcU"]/button[@class="sc-ifAKCX eiXwJb"]/span[1]/span[1] + + + true + equals + xpath:idRelative + //nav[@id='requests-list-filters']/div/div[3]/button/span/span + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Draft'])[1]/following::span[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='All'])[1]/following::span[4] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flagged'])[1]/preceding::span[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Denied'])[1]/preceding::span[3] + + + false + equals + xpath:position + //div[3]/button/span/span + + diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index 8904fd6f4..0705adce4 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -11,12 +11,17 @@ - '/home/travis/build/bcgov/OCWA/ui_tests/testfile1.csv' - TestFile1Path + '/home/travis/build/bcgov/OCWA/ui_tests/' + TestFilePath - '/home/travis/build/bcgov/OCWA/ui_tests/testfile2.csv' - TestFile2Path + 'testfile1.csv' + TestFile1Name + + + + 'testfile2.csv' + TestFile2Name From 7cfc1ac0408f6b3f25f35422a8b6c9f5483cd201 Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 2 Jan 2019 15:22:01 -0800 Subject: [PATCH 148/226] fixed WIP bug --- .../features/requester/draft_requests.feature | 4 +- .../edit_previously_submitted_request.feature | 2 +- .../groovy/Requester_step_def_ks.groovy | 99 ++++++++++--------- ui_tests/Profiles/Travis.glbl | 2 +- ui_tests/test_small_file_size_limit.txt | 0 5 files changed, 56 insertions(+), 51 deletions(-) create mode 100644 ui_tests/test_small_file_size_limit.txt diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature index 681dd4637..4a53d6fb1 100644 --- a/ui_tests/Include/features/requester/draft_requests.feature +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -2,14 +2,14 @@ Feature: Draft requests As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once Background: Given requester has logged in - Scenario: Save a draft request (no files) + Scenario: Save a draft request (with files) And requester has started a request And requester add output files to the request But has not submitted the request When the requester saves their request Then the requester should be able to re-open the request and pick up where they left off - Scenario: Save a draft request (with files) + Scenario: Save a draft request (no files) And requester has started a request But has not submitted the request When the requester saves their request diff --git a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature index 37f532ae2..e47b53249 100644 --- a/ui_tests/Include/features/requester/edit_previously_submitted_request.feature +++ b/ui_tests/Include/features/requester/edit_previously_submitted_request.feature @@ -2,7 +2,7 @@ Feature: edit a previously submitted request As an requester I want to be able to edit a request with a status of "Work in Progress" so that I can tweak my request to address my or an output checker's concerns about a request Scenario: Edit a request that has been reviewed by an output checker and needs revisions Given requester has logged in - And requester has a request of status "Work in Progress" + And requester has a request of status "Work in progress" When the requester views the request Then requester should be able to make changes to the request And requester should be able to re-submit the request \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index ad86d2801..18f4ba70e 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -63,12 +63,12 @@ class Requester_step_def_ks { final String REQUEST_PURPOSE_TXT_ID = "purpose" final String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" final String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" - + String g_requestName = "" TestObject g_newRequestButtonObject = null TestObject g_requestFormSaveCloseButtonObject = null String g_fileToUpload = "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name" - + /** * The step definitions below match with Katalon sample Gherkin steps */ @@ -96,7 +96,7 @@ class Requester_step_def_ks { g_newRequestButtonObject = new TestObject(NEW_REQUEST_BTN_ID) g_newRequestButtonObject.addProperty("id", ConditionType.EQUALS, NEW_REQUEST_BTN_ID, true) - + TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) @@ -107,7 +107,7 @@ class Requester_step_def_ks { WebUI.click(g_newRequestButtonObject) g_requestName = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), g_requestName) - + WebUI.setText(purposeTextbox, PURPOSE_TEXT) WebUI.delay(2) } @@ -128,27 +128,26 @@ class Requester_step_def_ks { WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name") WebUI.delay(5) - } @Given("the output files do not violate any blocking rules") def output_files_do_not_violate_blocking_rules(){} - + @Given("request violates given warning rule (.+)") def request_violates_warning_rule(String warningRule){ -// switch (warningRule) { -// case "": -// -// break -// } + // switch (warningRule.toLowerCase()) { + // case "": + // + // break + // } } @Given("request violates given blocking rule (.+)") def request_violates_blocking_rule(String blockingRule){ -// switch (blockingRule) { -// case "": -// -// break -// } + // switch (blockingRule.toLowerCase()) { + // case "": + // + // break + // } } @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") @@ -161,7 +160,7 @@ class Requester_step_def_ks { requester_adds_output_files() requester_submits_request() } - + @Given("request was last updated within the last month") def request_updated_within_last_month() {} @@ -170,31 +169,34 @@ class Requester_step_def_ks { //request_is_review_in_progress() requester_has_a_request_of_status("Review in progress") } - + @Given('requester has a request of status "(.+)"') def requester_has_a_request_of_status(String status) { - switch (status) { - case "Draft": + switch (status.toLowerCase()) { + case "draft": requester_starts_new_request() requester_adds_output_files() requester_saves_new_request() break - case "Awaiting review": + case "awaiting review": requester_has_submitted_a_request() break - case "Review in progress": + case "review in progress": requester_has_submitted_a_request() - //output checker needs to claim + //output checker needs to claim break - case "Work in progress": + case "work in progress": requester_has_submitted_a_request() requester_withdraws_request() break - case "Approved": + case "approved": requester_has_submitted_a_request() - //output checker needs to claim - //output checker needs to approve - break + //output checker needs to claim + //output checker needs to approve + break + default: + throw new Exception("status $status not found") + break } } @@ -228,7 +230,7 @@ class Requester_step_def_ks { def requester_views_request_they_created(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") } - + @When("the requester cancels the request") def requester_cancels_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") @@ -236,7 +238,7 @@ class Requester_step_def_ks { cancelButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_CANCEL_BTN_ID, true) WebUI.click(cancelButtonObject) } - + @When("the requester withdraws the request") def requester_withdraws_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") @@ -244,27 +246,31 @@ class Requester_step_def_ks { withdrawButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_WITHDRAW_BTN_ID, true) WebUI.click(withdrawButtonObject) } - + @When("requester views (.+) requests") def requester_views_requests_of_given_status(String status){ WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - switch (status) { - case "Draft": - WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Draft')) + switch (status.toLowerCase()) { + case "draft": + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Draft')) break - case "Submitted": + case "submitted": WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_QueuedIn Review')) break - case "Approved": + case "approved": //stub for when a filter for approved requests is added to UI - break + break + default: + throw new Exception("status $status not found") + break } } - + @Then("the requester should be able to re-open the request and pick up where they left off") def confirm_draft_save_was_successful() { WebUI.waitForPageLoad(20) + WebUI.delay(5) WebUI.verifyTextPresent(g_requestName, false) WebUI.closeBrowser() } @@ -293,28 +299,28 @@ class Requester_step_def_ks { WebUI.delay(5) WebUI.closeBrowser() } - + @Then('the request status is changed to "(.+)"') def request_should_be_in_given_status(String status){ //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") WebUI.verifyTextPresent(status, false) WebUI.closeBrowser() } - + @Then('requests of status "(.+)" should be displayed') def requests_of_given_status_should_be_displayed(String status){ WebUI.verifyTextPresent(g_requestName, false) WebUI.closeBrowser() } - + @Then("requests with updates older than a month should not be displayed") def no_old_requests_should_be_displayed(){} - + @Then("requester should see their new comment displayed") def requester_should_see_their_new_comment_displayed(){ WebUI.verifyTextPresent(TEST_COMMENT, false) } - + @Then("requester should be able to make changes to the request") def requester_should_be_able_to_make_changes_to_the_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") @@ -322,7 +328,7 @@ class Requester_step_def_ks { editButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_EDIT_BTN_ID, true) WebUI.click(editButtonObject) TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) - purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) + purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) WebUI.setText(purposeTextbox, EDITED_PURPOSE_TEXT) } @Then("requester should be able to re-submit the request") @@ -333,15 +339,14 @@ class Requester_step_def_ks { request_should_be_in_given_status("Review in progress") WebUI.closeBrowser() } - + @Then("requester should be informed that given blocking rule (.+) has been violated") def request_should_be_informed_of_blocking_rule_violation(){ //unclear how this is displayed in the UI } - + @Then("requester should be informed that given warning rule (.+) has been violated") def request_should_be_informed_of_warning_rule_violation(){ //unclear how this is displayed in the UI } - } \ No newline at end of file diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index 0705adce4..2a3c0c03b 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -16,7 +16,7 @@ - 'testfile1.csv' + 'testfile1.txt' TestFile1Name diff --git a/ui_tests/test_small_file_size_limit.txt b/ui_tests/test_small_file_size_limit.txt new file mode 100644 index 000000000..e69de29bb From 367f1b845491e02f400590bd2c8957e0c24da6ae Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 2 Jan 2019 15:23:03 -0800 Subject: [PATCH 149/226] changed test file extension --- ui_tests/{testfile1.csv => testfile1.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ui_tests/{testfile1.csv => testfile1.txt} (100%) diff --git a/ui_tests/testfile1.csv b/ui_tests/testfile1.txt similarity index 100% rename from ui_tests/testfile1.csv rename to ui_tests/testfile1.txt From 8f0628139bb63e8c8b458abc6eaa4d09022f9e1e Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 3 Jan 2019 11:33:38 -0800 Subject: [PATCH 150/226] refactored code; added multiple file upload test support --- .../requester/create_a_new_request.feature | 10 +- .../features/requester/draft_requests.feature | 2 +- .../groovy/Requester_step_def_ks.groovy | 177 ++++++++++-------- ui_tests/Profiles/Travis.glbl | 35 +++- ui_tests/Test Suites/CucumberSuite.ts | 2 +- .../test_files/test_min_file_size_limit.txt | 0 .../test_files/test_study_ids_in_file.txt | 5 + .../test_files/test_valid_file_upload.txt | 4 + .../test_files/test_warning_extension.csv | 4 + 9 files changed, 151 insertions(+), 88 deletions(-) create mode 100644 ui_tests/test_files/test_min_file_size_limit.txt create mode 100644 ui_tests/test_files/test_study_ids_in_file.txt create mode 100644 ui_tests/test_files/test_valid_file_upload.txt create mode 100644 ui_tests/test_files/test_warning_extension.csv diff --git a/ui_tests/Include/features/requester/create_a_new_request.feature b/ui_tests/Include/features/requester/create_a_new_request.feature index edb22a6f3..f639f2555 100644 --- a/ui_tests/Include/features/requester/create_a_new_request.feature +++ b/ui_tests/Include/features/requester/create_a_new_request.feature @@ -5,7 +5,7 @@ Feature: create a new request And requester has started a request And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge Scenario: A valid request - Given the output files do not violate any blocking rules + Given requester adds an output file that does not violate any blocking or warning rules When requester submits their request Then the request status is changed to "Awaiting review" Scenario: A request has no data @@ -20,8 +20,8 @@ Feature: create a new request Examples: | blocking_rule | | A request that has a file that is too big | - | The summation of all export file sizes exceeds the request file size limit | - | An export file has a blocked file extension | + | The summation of all output file sizes exceeds the request file size limit | + | An output file has a blocked file extension | | A request has a file with a StudyID in it | Scenario Outline: A request violates warning rule @@ -33,5 +33,5 @@ Feature: create a new request Examples: | warning_rule | | A request that has a file that exceeds the file size warning threshold | - | The summation of all export file sizes exceeds the request file size warning threshold | - | An export file has a warning file extension | \ No newline at end of file + | The summation of all output file sizes exceeds the request file size warning threshold | + | An output file has a warning file extension | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature index 4a53d6fb1..ecfbb0d1d 100644 --- a/ui_tests/Include/features/requester/draft_requests.feature +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -4,7 +4,7 @@ As an requester I want to be able to save a draft of my request so that I can do Given requester has logged in Scenario: Save a draft request (with files) And requester has started a request - And requester add output files to the request + And requester adds an output file that does not violate any blocking or warning rules But has not submitted the request When the requester saves their request Then the requester should be able to re-open the request and pick up where they left off diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 18f4ba70e..4ffcc9369 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -47,31 +47,30 @@ import cucumber.api.java.en.When class Requester_step_def_ks { - final String TEST_COMMENT = "test" - final String PURPOSE_TEXT = "The purpose of my project is X" - final String EDITED_PURPOSE_TEXT = "Edited the purpose to be Y" - final String REQUEST_PATH = "/requests/" - final String LOGIN_BTN_ID = "app-auth-login-button" - final String LOGIN_USERNAME = "pripley" - final String LOGIN_PWD = "EUKVYWz2orI=" - final String NEW_REQUEST_BTN_ID = "new-request-button" - final String REQUEST_SAVE_FILES_BTN_ID = "request-form-save-files-button" - final String REQUEST_FILES_UPLOAD_BTN_ID = "file-uploader-input" - final String REQUEST_SAVE_BTN_ID = "request-form-save-button" - final String REQUEST_SAVE_CLOSE_BTN_ID = "request-form-save-close-button" - final String REQUEST_EDIT_BTN_ID = "request-sidebar-edit-button" - final String REQUEST_PURPOSE_TXT_ID = "purpose" - final String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" - final String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" - + String TEST_COMMENT = "test" + String PURPOSE_TEXT = "The purpose of my project is X" + String EDITED_PURPOSE_TEXT = "Edited the purpose to be Y" + String REQUEST_PATH = "/requests/" + String LOGIN_BTN_ID = "app-auth-login-button" + String LOGIN_USERNAME = "pripley" + String LOGIN_PWD = "EUKVYWz2orI=" + String NEW_REQUEST_BTN_ID = "new-request-button" + String REQUEST_SAVE_FILES_BTN_ID = "request-form-save-files-button" + String REQUEST_FILES_UPLOAD_BTN_ID = "file-uploader-input" + String REQUEST_SAVE_BTN_ID = "request-form-save-button" + String REQUEST_SAVE_CLOSE_BTN_ID = "request-form-save-close-button" + String REQUEST_EDIT_BTN_ID = "request-sidebar-edit-button" + String REQUEST_PURPOSE_TXT_ID = "purpose" + String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" + String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" + String LOGOUT_URL = "/auth/logout" + String g_requestName = "" - TestObject g_newRequestButtonObject = null - TestObject g_requestFormSaveCloseButtonObject = null - String g_fileToUpload = "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name" - + /** * The step definitions below match with Katalon sample Gherkin steps */ + @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') @@ -79,8 +78,7 @@ class Requester_step_def_ks { WebUI.navigateToUrl(GlobalVariable.OCWA_URL) //WebUI.navigateToUrl("http://localhost:8000") - TestObject loginButton = new TestObject(LOGIN_BTN_ID) - loginButton.addProperty("id", ConditionType.EQUALS, LOGIN_BTN_ID, true) + TestObject loginButton = get_test_object_by_id(LOGIN_BTN_ID) WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) @@ -94,21 +92,17 @@ class Requester_step_def_ks { @Given("requester has started a request") def requester_starts_new_request() { - g_newRequestButtonObject = new TestObject(NEW_REQUEST_BTN_ID) - g_newRequestButtonObject.addProperty("id", ConditionType.EQUALS, NEW_REQUEST_BTN_ID, true) - - TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) - purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) + TestObject newRequestButtonObject = get_test_object_by_id(NEW_REQUEST_BTN_ID) WebUI.waitForPageLoad(30) WebUI.delay(5) - WebUI.waitForElementClickable(g_newRequestButtonObject, 30) - WebUI.click(g_newRequestButtonObject) + WebUI.waitForElementClickable(newRequestButtonObject, 30) + WebUI.click(newRequestButtonObject) g_requestName = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), g_requestName) - WebUI.setText(purposeTextbox, PURPOSE_TEXT) + WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), PURPOSE_TEXT) WebUI.delay(2) } @@ -116,53 +110,87 @@ class Requester_step_def_ks { def requester_has_not_submitted_new_request() { } - @Given("requester add output files to the request") - def requester_adds_output_files() { + def requester_adds_output_file(String fileToUpload, String secondFile="", String thirdFile="") { - TestObject requestFormSaveFilesButton = new TestObject(REQUEST_SAVE_FILES_BTN_ID) - requestFormSaveFilesButton.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_FILES_BTN_ID, true) + TestObject requestFormSaveFilesButton = get_test_object_by_id(REQUEST_SAVE_FILES_BTN_ID) + WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) - TestObject uploadFileButton = new TestObject(REQUEST_FILES_UPLOAD_BTN_ID) - uploadFileButton.addProperty("id", ConditionType.EQUALS, REQUEST_FILES_UPLOAD_BTN_ID, true) - WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$GlobalVariable.TestFile1Name") - + TestObject uploadFileButton = get_test_object_by_id(REQUEST_FILES_UPLOAD_BTN_ID) + + WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$fileToUpload") WebUI.delay(5) + if (secondFile != "") { + WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$secondFile") + WebUI.delay(5) + } + + if (thirdFile != "") { + WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$thirdFile") + WebUI.delay(5) + } } - @Given("the output files do not violate any blocking rules") - def output_files_do_not_violate_blocking_rules(){} + @Given("requester adds an output file that does not violate any blocking or warning rules") + def requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules(){ + requester_adds_output_file(GlobalVariable.ValidFileName) + } @Given("request violates given warning rule (.+)") def request_violates_warning_rule(String warningRule){ - // switch (warningRule.toLowerCase()) { - // case "": - // - // break - // } + requester_starts_new_request() + switch (warningRule.toLowerCase()) { + case "an output file has a warning file extension": + requester_adds_output_file(GlobalVariable.WarningExtensionFileName) + break + case "a request that has a file that exceeds the file size warning threshold": + requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) + break + case "the summation of all output file sizes exceeds the request file size warning threshold": + //need to add output files that pass the warning limit individually but together surpass the combined size threshold + //requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) + break + default: + throw new Exception("warning rule $warningRule not found") + break + } } @Given("request violates given blocking rule (.+)") def request_violates_blocking_rule(String blockingRule){ - // switch (blockingRule.toLowerCase()) { - // case "": - // - // break - // } + requester_starts_new_request() + switch (blockingRule.toLowerCase()) { + case "an output file has a blocked file extension": + requester_adds_output_file(GlobalVariable.BlockedExtensionFileName) + break + case "a request that has a file that is too big": + requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) + break + case "the summation of all output file sizes exceeds the request file size limit": + //need to add output files that pass the blocked limit individually but together surpass the combined size threshold + //requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) + break + default: + throw new Exception("block rule $blockingRule not found") + break + } } @Given("the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge") def requester_affirms_output_is_safe() { + //stubbed in case we need to check a box in the UI to support this } @Given("requester has submitted a request") def requester_has_submitted_a_request(){ requester_starts_new_request() - requester_adds_output_files() + requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules() requester_submits_request() } @Given("request was last updated within the last month") - def request_updated_within_last_month() {} + def request_updated_within_last_month() { + //stubbed because newly created requests will always have an update date within the last month + } @Given("the request has been claimed by an output checker") def request_has_been_claimed_by_a_oc(){ @@ -175,7 +203,7 @@ class Requester_step_def_ks { switch (status.toLowerCase()) { case "draft": requester_starts_new_request() - requester_adds_output_files() + requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules() requester_saves_new_request() break case "awaiting review": @@ -202,16 +230,12 @@ class Requester_step_def_ks { @When("the requester saves their request") def requester_saves_new_request() { - g_requestFormSaveCloseButtonObject = new TestObject(REQUEST_SAVE_CLOSE_BTN_ID) - g_requestFormSaveCloseButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_CLOSE_BTN_ID, true) - WebUI.click(g_requestFormSaveCloseButtonObject) + WebUI.click(get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID)) } @When("requester submits their request") def requester_submits_request() { - TestObject requestFormSaveButtonObject = new TestObject(REQUEST_SAVE_BTN_ID) - requestFormSaveButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_SAVE_BTN_ID, true) - WebUI.click(requestFormSaveButtonObject) + WebUI.click(get_test_object_by_id(REQUEST_SAVE_BTN_ID)) WebUI.delay(15) WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) @@ -234,19 +258,15 @@ class Requester_step_def_ks { @When("the requester cancels the request") def requester_cancels_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") - TestObject cancelButtonObject = new TestObject(REQUEST_CANCEL_BTN_ID) - cancelButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_CANCEL_BTN_ID, true) - WebUI.click(cancelButtonObject) + WebUI.click(get_test_object_by_id(REQUEST_CANCEL_BTN_ID)) } @When("the requester withdraws the request") def requester_withdraws_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") - TestObject withdrawButtonObject = new TestObject(REQUEST_WITHDRAW_BTN_ID) - withdrawButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_WITHDRAW_BTN_ID, true) - WebUI.click(withdrawButtonObject) + WebUI.click(get_test_object_by_id(REQUEST_WITHDRAW_BTN_ID)) } - + @When("requester views (.+) requests") def requester_views_requests_of_given_status(String status){ WebUI.navigateToUrl(GlobalVariable.OCWA_URL) @@ -260,7 +280,7 @@ class Requester_step_def_ks { case "approved": //stub for when a filter for approved requests is added to UI break - default: + default: throw new Exception("status $status not found") break } @@ -272,6 +292,7 @@ class Requester_step_def_ks { WebUI.waitForPageLoad(20) WebUI.delay(5) WebUI.verifyTextPresent(g_requestName, false) + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$LOGOUT_URL") WebUI.closeBrowser() } @@ -289,9 +310,9 @@ class Requester_step_def_ks { @Then("the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes") def submitted_request_info_matches_what_was_submitted(){ - WebUI.verifyTextPresent(GlobalVariable.TestFile1Path.toString(), false) + WebUI.verifyTextPresent(GlobalVariable.ValidFileName, false) WebUI.verifyTextPresent(g_requestName, false) - WebUI.verifyTextPresent(g_purpose, false) + WebUI.verifyTextPresent(PURPOSE_TEXT, false) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) WebUI.delay(2) //WebUI.verifyTextPresent(TEST_COMMENT, false) @@ -324,12 +345,8 @@ class Requester_step_def_ks { @Then("requester should be able to make changes to the request") def requester_should_be_able_to_make_changes_to_the_request(){ WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") - TestObject editButtonObject = new TestObject("edit-button") - editButtonObject.addProperty("id", ConditionType.EQUALS, REQUEST_EDIT_BTN_ID, true) - WebUI.click(editButtonObject) - TestObject purposeTextbox = new TestObject(REQUEST_PURPOSE_TXT_ID) - purposeTextbox.addProperty("id", ConditionType.EQUALS, REQUEST_PURPOSE_TXT_ID, true) - WebUI.setText(purposeTextbox, EDITED_PURPOSE_TEXT) + WebUI.click(get_test_object_by_id(REQUEST_EDIT_BTN_ID)) + WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), EDITED_PURPOSE_TEXT) } @Then("requester should be able to re-submit the request") def requester_should_be_able_to_resubmit_request(){ @@ -349,4 +366,12 @@ class Requester_step_def_ks { def request_should_be_informed_of_warning_rule_violation(){ //unclear how this is displayed in the UI } + + //Helper function for getting TestObject from the id of an html element + def get_test_object_by_id(String id) { + TestObject tObject = new TestObject(id) + tObject.addProperty("id", ConditionType.EQUALS, id, true) + return tObject + } + } \ No newline at end of file diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index 2a3c0c03b..59e272f7c 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -11,17 +11,42 @@ - '/home/travis/build/bcgov/OCWA/ui_tests/' + '/home/travis/build/bcgov/OCWA/ui_tests/test_files/' TestFilePath - 'testfile1.txt' - TestFile1Name + 'test_valid_file_upload.txt' + ValidFileName - 'testfile2.csv' - TestFile2Name + 'test_warning_extension.csv' + WarningExtensionFileName + + + + 'test_blocked_file_extension.exe' + BlockedExtensionFileName + + + + 'test_min_file_size_limit.txt' + MinSizeLimitFileName + + + + 'test_warning_max_file_size_limit.txt' + WarningMaxSizeLimitFileName + + + + 'test_blocked_max_file_size_limit.txt' + BlockedMaxSizeLimitFileName + + + + 'test_study_ids_in_file.txt' + BlockedStudyIDFileName diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts index d3f3504cb..755794c9e 100644 --- a/ui_tests/Test Suites/CucumberSuite.ts +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -4,7 +4,7 @@ CucumberSuite false - 2018-12-21T12:54:35 + 2019-01-03T11:10:38 0 30 diff --git a/ui_tests/test_files/test_min_file_size_limit.txt b/ui_tests/test_files/test_min_file_size_limit.txt new file mode 100644 index 000000000..e69de29bb diff --git a/ui_tests/test_files/test_study_ids_in_file.txt b/ui_tests/test_files/test_study_ids_in_file.txt new file mode 100644 index 000000000..319c9e98c --- /dev/null +++ b/ui_tests/test_files/test_study_ids_in_file.txt @@ -0,0 +1,5 @@ +0123456789 +9012345678 +9876543210 +7654321098 +8901234567 \ No newline at end of file diff --git a/ui_tests/test_files/test_valid_file_upload.txt b/ui_tests/test_files/test_valid_file_upload.txt new file mode 100644 index 000000000..40599af91 --- /dev/null +++ b/ui_tests/test_files/test_valid_file_upload.txt @@ -0,0 +1,4 @@ +Project Entity ID,Accident type,Accident Date +3d3bc539-9aec-45e0-96a3-4e851068d5e2,motor vehicle,2/26/2018 +2fc94c19-78d8-42a4-8e1a-0d8103340c72,recreational sport,3/15/2018 +a4832b32-25ac-41fc-96ca-7be5753b98b8,motor vehicle,4/22/2018 diff --git a/ui_tests/test_files/test_warning_extension.csv b/ui_tests/test_files/test_warning_extension.csv new file mode 100644 index 000000000..499fa65bc --- /dev/null +++ b/ui_tests/test_files/test_warning_extension.csv @@ -0,0 +1,4 @@ +Project Entity ID,Hospital Number,Fiscal Year,Province Issuing Health Care Number,Gender,Age in Years,Local Health Area,Triage date/time,Triage Level,Registration Date/Time,Physician Initial Assessment Date/Time,Disposition Date/Time +3d3bc539-9aec-45e0-96a3-4e851068d5e2,111,2017,BC,M,23,Victoria,2017-10-20T21:32:52,5,2018-02-26T21:32:52,2018-02-26T23:32:52,2018-02-26T23:32:52 +a4832b32-25ac-41fc-96ca-7be5753b98b8,121,2017,BC,F,47,Kelowna,2017-11-26T21:32:53,4,2018-02-26T21:32:53,2018-02-26T23:32:53,2018-02-26T23:32:53 +2fc94c19-78d8-42a4-8e1a-0d8103340c72,134,2017,BC,F,62,Vancouver,2017-12-23T21:32:54,5,2018-02-26T21:32:54,2018-02-26T23:32:54,2018-02-26T23:32:54 From c670c2603c6831002b92b91f72d387559190d5d9 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 3 Jan 2019 11:56:34 -0800 Subject: [PATCH 151/226] try navigating to url that does not use a global var --- ui_tests/Data Files/TestFile1.dat | 16 ---------------- ui_tests/Data Files/TestFile2.dat | 16 ---------------- .../requester/see_requests_by_status.feature | 3 ++- .../scripts/groovy/Requester_step_def_ks.groovy | 12 +++++++++--- ui_tests/test_small_file_size_limit.txt | 0 ui_tests/testfile1.txt | 4 ---- ui_tests/testfile2.csv | 4 ---- 7 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 ui_tests/Data Files/TestFile1.dat delete mode 100644 ui_tests/Data Files/TestFile2.dat delete mode 100644 ui_tests/test_small_file_size_limit.txt delete mode 100644 ui_tests/testfile1.txt delete mode 100644 ui_tests/testfile2.csv diff --git a/ui_tests/Data Files/TestFile1.dat b/ui_tests/Data Files/TestFile1.dat deleted file mode 100644 index ef8081321..000000000 --- a/ui_tests/Data Files/TestFile1.dat +++ /dev/null @@ -1,16 +0,0 @@ - - - file for testing upload - TestFile1 - - true - COMMA - 679aba66-2311-432f-8bab-84485811301a - C:\Users\PaulR\Documents\2 - Metadata\HAS project\hospital_visits_bc_2017.csv - CSV - false - - false - - false - diff --git a/ui_tests/Data Files/TestFile2.dat b/ui_tests/Data Files/TestFile2.dat deleted file mode 100644 index 4e68b8432..000000000 --- a/ui_tests/Data Files/TestFile2.dat +++ /dev/null @@ -1,16 +0,0 @@ - - - File for testing file upload - TestFile2 - - true - - 22393f29-c163-446c-aa0b-da83fe18248a - C:\Users\PaulR\Documents\2 - Metadata\HAS project\sports_accidents_bc_2017.xls - ExcelFile - false - - false - sports_accidents_bc_2017 - false - diff --git a/ui_tests/Include/features/requester/see_requests_by_status.feature b/ui_tests/Include/features/requester/see_requests_by_status.feature index e011181c0..41f49ca12 100644 --- a/ui_tests/Include/features/requester/see_requests_by_status.feature +++ b/ui_tests/Include/features/requester/see_requests_by_status.feature @@ -15,4 +15,5 @@ As an requester I want to be able to see a history of my requests so that I can | Awaiting review | Submitted | | Review in progress | Submitted | | Draft | Draft | - | Work in progress | Draft | \ No newline at end of file + | Work in progress | Draft | + | Cancelled | Cancelled | \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 4ffcc9369..03b09cb4a 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -76,8 +76,8 @@ class Requester_step_def_ks { WebUI.openBrowser('') WebUI.delay(5) - WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - //WebUI.navigateToUrl("http://localhost:8000") + //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = get_test_object_by_id(LOGIN_BTN_ID) WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) @@ -217,6 +217,10 @@ class Requester_step_def_ks { requester_has_submitted_a_request() requester_withdraws_request() break + case "cancelled": + requester_has_submitted_a_request() + requester_cancels_request() + break case "approved": requester_has_submitted_a_request() //output checker needs to claim @@ -280,6 +284,9 @@ class Requester_step_def_ks { case "approved": //stub for when a filter for approved requests is added to UI break + case "cancelled": + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Cancelled')) + break default: throw new Exception("status $status not found") break @@ -315,7 +322,6 @@ class Requester_step_def_ks { WebUI.verifyTextPresent(PURPOSE_TEXT, false) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) WebUI.delay(2) - //WebUI.verifyTextPresent(TEST_COMMENT, false) requester_should_see_their_new_comment_displayed() WebUI.delay(5) WebUI.closeBrowser() diff --git a/ui_tests/test_small_file_size_limit.txt b/ui_tests/test_small_file_size_limit.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui_tests/testfile1.txt b/ui_tests/testfile1.txt deleted file mode 100644 index 40599af91..000000000 --- a/ui_tests/testfile1.txt +++ /dev/null @@ -1,4 +0,0 @@ -Project Entity ID,Accident type,Accident Date -3d3bc539-9aec-45e0-96a3-4e851068d5e2,motor vehicle,2/26/2018 -2fc94c19-78d8-42a4-8e1a-0d8103340c72,recreational sport,3/15/2018 -a4832b32-25ac-41fc-96ca-7be5753b98b8,motor vehicle,4/22/2018 diff --git a/ui_tests/testfile2.csv b/ui_tests/testfile2.csv deleted file mode 100644 index 499fa65bc..000000000 --- a/ui_tests/testfile2.csv +++ /dev/null @@ -1,4 +0,0 @@ -Project Entity ID,Hospital Number,Fiscal Year,Province Issuing Health Care Number,Gender,Age in Years,Local Health Area,Triage date/time,Triage Level,Registration Date/Time,Physician Initial Assessment Date/Time,Disposition Date/Time -3d3bc539-9aec-45e0-96a3-4e851068d5e2,111,2017,BC,M,23,Victoria,2017-10-20T21:32:52,5,2018-02-26T21:32:52,2018-02-26T23:32:52,2018-02-26T23:32:52 -a4832b32-25ac-41fc-96ca-7be5753b98b8,121,2017,BC,F,47,Kelowna,2017-11-26T21:32:53,4,2018-02-26T21:32:53,2018-02-26T23:32:53,2018-02-26T23:32:53 -2fc94c19-78d8-42a4-8e1a-0d8103340c72,134,2017,BC,F,62,Vancouver,2017-12-23T21:32:54,5,2018-02-26T21:32:54,2018-02-26T23:32:54,2018-02-26T23:32:54 From 390a56fed3aba0c77f321ee1b0a24698083be56c Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 3 Jan 2019 13:45:44 -0800 Subject: [PATCH 152/226] switched the tests for Travis to use the default profile --- .travis.yml | 2 +- ui_tests/.gitignore | 2 +- ui_tests/.project | 18 +++++++ .../groovy/Requester_step_def_ks.groovy | 4 +- ui_tests/Profiles/default.glbl | 52 +++++++++++++++++++ ui_tests/Test Suites/CucumberSuite.ts | 2 +- .../com.kms.katalon.execution.properties | 5 ++ ...com.kms.katalon.execution.webui.properties | 9 +++- 8 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 ui_tests/Profiles/default.glbl diff --git a/.travis.yml b/.travis.yml index 79efa2915..e485b8ef9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -463,7 +463,7 @@ matrix: #RUN Integration Tests - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" + - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="default" -browserType="Chrome (headless)" - name: "Front End" stage: "Frontend" diff --git a/ui_tests/.gitignore b/ui_tests/.gitignore index 5541515b5..b9d3bf996 100644 --- a/ui_tests/.gitignore +++ b/ui_tests/.gitignore @@ -1,7 +1,7 @@ # Katalon Studio Reports/* ReportFolder/* -Profiles/default.glbl +Profiles/local.glbl .classpath .settings *.class diff --git a/ui_tests/.project b/ui_tests/.project index 3955e7e6b..9899034dd 100644 --- a/ui_tests/.project +++ b/ui_tests/.project @@ -88,5 +88,23 @@ (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + 1546550314282 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1546550314310 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 03b09cb4a..fb82a5747 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -76,8 +76,8 @@ class Requester_step_def_ks { WebUI.openBrowser('') WebUI.delay(5) - //WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - WebUI.navigateToUrl("http://localhost:8000") + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + //WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = get_test_object_by_id(LOGIN_BTN_ID) WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) diff --git a/ui_tests/Profiles/default.glbl b/ui_tests/Profiles/default.glbl new file mode 100644 index 000000000..f3ed106f1 --- /dev/null +++ b/ui_tests/Profiles/default.glbl @@ -0,0 +1,52 @@ + + + + default + + true + + + 'http://localhost:8000' + OCWA_URL + + + + '/home/travis/build/bcgov/OCWA/ui_tests/test_files/' + TestFilePath + + + + 'test_valid_file_upload.txt' + ValidFileName + + + + 'test_warning_extension.csv' + WarningExtensionFileName + + + + 'test_blocked_file_extension.exe' + BlockedExtensionFileName + + + + 'test_min_file_size_limit.txt' + MinSizeLimitFileName + + + + 'test_warning_max_file_size_limit.txt' + WarningMaxSizeLimitFileName + + + + 'test_blocked_max_file_size_limit.txt' + BlockedMaxSizeLimitFileName + + + + 'test_study_ids_in_file.txt' + BlockedStudyIDFileName + + diff --git a/ui_tests/Test Suites/CucumberSuite.ts b/ui_tests/Test Suites/CucumberSuite.ts index 755794c9e..2f6ff16f3 100644 --- a/ui_tests/Test Suites/CucumberSuite.ts +++ b/ui_tests/Test Suites/CucumberSuite.ts @@ -4,7 +4,7 @@ CucumberSuite false - 2019-01-03T11:10:38 + 2019-01-03T12:47:19 0 30 diff --git a/ui_tests/settings/internal/com.kms.katalon.execution.properties b/ui_tests/settings/internal/com.kms.katalon.execution.properties index e69de29bb..5d9ce96af 100644 --- a/ui_tests/settings/internal/com.kms.katalon.execution.properties +++ b/ui_tests/settings/internal/com.kms.katalon.execution.properties @@ -0,0 +1,5 @@ +#Wed Jan 02 14:47:57 PST 2019 +execution.default.timeout=30 +execution.default.openReportAfterExecuting=false +execution.default.quitDriversAfterExecutingTestCase=false +execution.default.quitDriversAfterExecutingTestSuite=true diff --git a/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties index c09ce9715..ebe677f9a 100644 --- a/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties +++ b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties @@ -1,2 +1,7 @@ -#Sat Sep 08 18:41:20 NZST 2018 -execution.default.selectingCapturedObjectSelectorMethod="XPATH" +#Wed Jan 02 14:47:57 PST 2019 +execution.default.selectingCapturedObjectSelectorMethod="XPATH" +execution.default.webUi.enablePageLoadTimeout=false +execution.default.webUi.pageLoadTimeout=30 +execution.default.webUi.ignorePageLoadTimeOutException=false +execution.default.webUi.actionDelay=0 +execution.default.waitForIEHanging=600 From cb3057e7000e78c09b2e92d0e28046907bfe9516 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 3 Jan 2019 14:10:56 -0800 Subject: [PATCH 153/226] fixed path of microservice template config file; upgraded KS to 5.10.1 --- .travis.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index e485b8ef9..3c1470ebb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,13 +105,13 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi @@ -150,7 +150,7 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - sudo pytest - wget -q ${HELM_URL}/${HELM_TGZ} @@ -203,11 +203,11 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1,validator -m pytest - helm lint helm/validate-api @@ -250,13 +250,13 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1,validator -m pytest - sudo coverage xml - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1 -m pytest - sudo coverage xml @@ -323,13 +323,13 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi @@ -427,7 +427,7 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & @@ -435,19 +435,19 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - sudo pip3 install -e . - python3 wsgi.py & #Start Request Api - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/default.json.template config/default.json - - cp config/test.json.template config/test.json + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json - NODE_ENV=test npm start & #Start FrontEnd - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/default.json.template config/default.json + - cp config/default.json.example config/default.json - yarn - NODE_ENV=test yarn start & @@ -516,7 +516,7 @@ env: - YAMLLINT_VERSION=1.8.1 - CXX=g++-4.8 - MONGODB=4.1.1 - - KATALON_VERSION=5.9.0 + - KATALON_VERSION=5.10.1 - TUSD_VERSION=0.11.0 - SONAR_URL=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/ - SONAR_APP=sonar-scanner From b068bc3663030c544bb046f42e94b27ad59578d2 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 14:41:29 -0800 Subject: [PATCH 154/226] Use terraform environment for integration tests --- .travis.yml | 78 ++++++++------------------- terraform/.gitignore | 5 +- terraform/README.md | 20 +++++-- terraform/bin/scheduled-deploy.sh | 2 +- terraform/keycloak.tf | 9 +++- terraform/mongodb.tf | 3 ++ terraform/nginx-proxy.tf | 13 ++++- terraform/ocwa_forum_api.tf | 4 +- terraform/ocwa_frontend.tf | 27 ++++++++-- terraform/ocwa_policy_api.tf | 8 ++- terraform/ocwa_request_api.tf | 10 ++-- terraform/ocwa_storage_api.tf | 18 +++++-- terraform/ocwa_validate_api.tf | 9 ++-- terraform/postgres.tf | 12 +++++ terraform/report.tf | 19 ++++++- terraform/scripts/keycloak-setup.sh | 10 ++-- terraform/scripts/mongodb.tpl | 7 +++ terraform/scripts/nginx-proxy.tpl | 67 ++++++++++------------- terraform/scripts/terraform.lock.tpl | 8 +++ terraform/scripts/wait-for-healthy.sh | 14 +++++ terraform/self-signed-cert.tf | 32 +++++++++++ terraform/terraform.tfvars.example | 33 ++++++++++++ terraform/variables.tf | 16 ++++++ 23 files changed, 298 insertions(+), 126 deletions(-) create mode 100644 terraform/scripts/terraform.lock.tpl create mode 100755 terraform/scripts/wait-for-healthy.sh create mode 100644 terraform/self-signed-cert.tf create mode 100644 terraform/terraform.tfvars.example diff --git a/.travis.yml b/.travis.yml index 3c1470ebb..45e45d7e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,10 @@ addons: token: secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= + hosts: + - auth.example.demo + - ocwa.example.demo + matrix: include: - name: "Forum Api" @@ -390,66 +394,28 @@ matrix: - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - npm install -g yarn --cache-min 999999999 script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - #Start Forum Api - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - NODE_ENV=test npm start & - - #Start Minio - - wget --quiet https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - #Start TusD - - wget --quiet https://github.com/tus/tusd/releases/download/$TUSD_VERSION/tusd_linux_amd64.tar.gz - - export AWS_ACCESS_KEY_ID=$MINIO_ACCESS_KEY - - export AWS_SECRET_ACCESS_KEY=$MINIO_SECRET_KEY - - export AWS_REGION=us-east-1 - - tusd -s3-endpoint http://localhost:9000 -s3-bucket myBucket & - - #Start Validate Api - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.example config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - #Start Policy Api - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.example config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - #Start Request Api - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json - - NODE_ENV=test npm start & - - #Start FrontEnd - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/default.json.example config/default.json - - yarn - - NODE_ENV=test yarn start & + - cd /home/travis/build/bcgov + - curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip + - unzip -o terraform_0.11.8_linux_amd64.zip + - rm -rf terraform_0.11.8_linux_amd64.zip + - chmod +x terraform + + - cd /home/travis/build/bcgov/OCWA/terraform + - mkdir _tmp + - cp terraform.tfvars.example terraform.tfvars + - /home/travis/build/bcgov/terraform init + - /home/travis/build/bcgov/terraform plan -var hostRootPath=`pwd`/_tmp + - /home/travis/build/bcgov/terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve + - /home/travis/build/bcgov/terraform show + - ls -l _tmp + - docker ps + - sleep 5 + - curl -v -k https://auth.example.demo + - curl -v -k https://ocwa.example.demo #Katalon requires OpenJDK 8 installed separately - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk diff --git a/terraform/.gitignore b/terraform/.gitignore index 174bcacf9..080e30514 100644 --- a/terraform/.gitignore +++ b/terraform/.gitignore @@ -1 +1,4 @@ -terraform.tfvars \ No newline at end of file +terraform.tfvars +terraform.tfstate* +terraform.auto.* +.terraform* diff --git a/terraform/README.md b/terraform/README.md index 520291e9b..56e460300 100644 --- a/terraform/README.md +++ b/terraform/README.md @@ -2,7 +2,7 @@ # Terraform-Based deployment -Create a terraform.tfvars file: +Create a terraform.tfvars file (see terraform.tfvars.example): ``` hostRootPath = "/var/ocwa" @@ -21,10 +21,23 @@ keycloak = { ocwaHost = "https://ocwa.example.com" +ocwaWebSocketHost = "wss://ocwa.example.com/socket" + authHost = "https://auth.example.com" sslCertificate = "/ssl/cert.pem" sslCertificateKey = "/ssl/key.pem" + +images = { + request_api = ":edge" + validate_api = ":edge" + forum_api = ":edge" + policy_api = ":edge" + frontend = ":edge" + minio = ":latest" + tusd = ":latest" +} + ``` Run the following commands: @@ -32,8 +45,7 @@ Run the following commands: ``` terraform init -terraform plan +terraform plan -var hostRootPath=`pwd`/_tmp -terraform apply +terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve ``` - diff --git a/terraform/bin/scheduled-deploy.sh b/terraform/bin/scheduled-deploy.sh index 9671a4289..822e0c7e3 100755 --- a/terraform/bin/scheduled-deploy.sh +++ b/terraform/bin/scheduled-deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -cd /home/acope/onpremise/OCWA/terraform +cd ${pwd}/deploy/OCWA/terraform terraform plan diff --git a/terraform/keycloak.tf b/terraform/keycloak.tf index f09fc0e15..c0af09ff6 100644 --- a/terraform/keycloak.tf +++ b/terraform/keycloak.tf @@ -10,6 +10,7 @@ resource "docker_image" "keycloak" { resource "docker_container" "ocwa_keycloak" { image = "${docker_image.keycloak.latest}" name = "ocwa_keycloak" + restart = "on-failure" networks_advanced = { name = "${docker_network.private_network.name}" } env = [ "DB_VENDOR=postgres", @@ -23,16 +24,20 @@ resource "docker_container" "ocwa_keycloak" { "KEYCLOAK_PASSWORD=${random_string.keycloakAdminPassword.result}" ] healthcheck = { - test = ["CMD", "curl", "-f", "https://authdev.popdata.bc.ca/auth/"] + test = ["CMD", "curl", "-f", "http://ocwa_keycloak:8080"] interval = "5s" timeout = "5s" start_period = "10s" - retries = 5 + retries = 20 } depends_on = ["null_resource.postgres_first_time_install"] } resource "null_resource" "keycloak_first_time_install" { + provisioner "local-exec" { + command = "scripts/wait-for-healthy.sh ocwa_keycloak" + } + provisioner "local-exec" { environment = { "TESTUSER_PASSWORD" = "${random_string.testUserPassword.result}", diff --git a/terraform/mongodb.tf b/terraform/mongodb.tf index 41a42b463..cf2126373 100644 --- a/terraform/mongodb.tf +++ b/terraform/mongodb.tf @@ -31,6 +31,9 @@ resource "local_file" "mongodb_script" { } resource "null_resource" "mongodb_first_time_install" { + provisioner "local-exec" { + command = "sleep 10" + } provisioner "local-exec" { environment = { SCRIPT_PATH = "${var.hostRootPath}" diff --git a/terraform/nginx-proxy.tf b/terraform/nginx-proxy.tf index 2719fc6ef..4daae223e 100644 --- a/terraform/nginx-proxy.tf +++ b/terraform/nginx-proxy.tf @@ -10,6 +10,7 @@ resource "docker_image" "nginx" { resource "docker_container" "ocwa_nginx" { image = "${docker_image.nginx.latest}" name = "ocwa_nginx" + restart = "on-failure" ports = [{ internal = 80 external = 80 @@ -30,14 +31,24 @@ resource "docker_container" "ocwa_nginx" { } ] - depends_on = ["local_file.proxy"] + labels = { + NGINX_CONFIG_MD5 = "${md5(local_file.proxy.content)}" + } + + depends_on = [ + "local_file.proxy", + "null_resource.keycloak_first_time_install", + "null_resource.minio_first_install" + ] } data "template_file" "proxy_config" { template = "${file("${path.module}/scripts/nginx-proxy.tpl")}" vars = { authHost = "${var.authHost}" + authHostname = "${var.authHostname}" ocwaHost = "${var.ocwaHost}" + ocwaHostname = "${var.ocwaHostname}" sslCertificate = "${var.sslCertificate}" sslCertificateKey = "${var.sslCertificateKey}" } diff --git a/terraform/ocwa_forum_api.tf b/terraform/ocwa_forum_api.tf index fc140572f..bf9812a40 100644 --- a/terraform/ocwa_forum_api.tf +++ b/terraform/ocwa_forum_api.tf @@ -1,6 +1,6 @@ data "docker_registry_image" "ocwa_forum_api" { - name = "bcgovimages/ocwa_forum_api:edge" + name = "bcgovimages/ocwa_forum_api${var.images["forum_api"]}" } resource "docker_image" "ocwa_forum_api" { @@ -11,6 +11,7 @@ resource "docker_image" "ocwa_forum_api" { resource "docker_container" "ocwa_forum_api" { image = "${docker_image.ocwa_forum_api.latest}" name = "ocwa_forum_api" + restart = "on-failure" networks_advanced = { name = "${docker_network.private_network.name}" } env = [ "JWT_SECRET=${random_string.jwtSecret.result}", @@ -18,6 +19,7 @@ resource "docker_container" "ocwa_forum_api" { "API_PORT=3000", "WS_PORT=3001", "DB_HOST=ocwa_mongodb", + "DB_PORT=27017", "DB_NAME=oc_db", "DB_USERNAME=${var.mongodb["username"]}", "DB_PASSWORD=${random_string.mongoSuperPassword.result}", diff --git a/terraform/ocwa_frontend.tf b/terraform/ocwa_frontend.tf index 23733f91e..7f7b6e90b 100644 --- a/terraform/ocwa_frontend.tf +++ b/terraform/ocwa_frontend.tf @@ -1,6 +1,6 @@ data "docker_registry_image" "ocwa_frontend" { - name = "bcgovimages/ocwa_frontend:edge" + name = "bcgovimages/ocwa_frontend${var.images["frontend"]}" } resource "docker_image" "ocwa_frontend" { @@ -11,11 +11,19 @@ resource "docker_image" "ocwa_frontend" { resource "docker_container" "ocwa_frontend" { image = "${docker_image.ocwa_frontend.latest}" name = "ocwa_frontend" + restart = "on-failure" networks_advanced = { name = "${docker_network.private_network.name}" } ports = { internal = 8000 external = 8000 } + host = [ + { + host = "${var.authHostname}" + ip = "${docker_container.ocwa_nginx.ip_address}" + } + ] + env = [ "COOKIE_SECRET=${random_string.cookie.result}", "JWT_SECRET=${random_string.jwtSecret.result}", @@ -27,12 +35,23 @@ resource "docker_container" "ocwa_frontend" { "AUTH_SCOPES=openid offline_access", "AUTH_CALLBACK_URL=${var.ocwaHost}/auth", "CLIENT_SECRET=${random_uuid.outputcheckerClientSecret.result}", - "FILES_API_HOST=ocwadev.popdata.bc.ca", + "FILES_API_HOST=${var.ocwaHost}", "REQUEST_API_HOST=ocwa_request_api:3002", "FORUM_API_HOST=ocwa_forum_api:3000", - "FORUM_SOCKET_HOST=ocwa_forum_api:3001", + "FORUM_SOCKET_HOST=${var.ocwaWebSocketHost}", "HOST=0.0.0.0", "PORT=8000", - "USER_ID_FIELD=email" + "USER_ID_FIELD=email", + "STORAGE_ENDPOINT=ocwaminio", + "STORAGE_PORT=9000", + "STORAGE_SSL=false", + "STORAGE_BUCKET=bucket", + "STORAGE_ACCESS_KEY=${random_id.accessKey.hex}", + "STORAGE_SECRET_KEY=${random_string.secretKey.result}", + "NODE_TLS_REJECT_UNAUTHORIZED=0" + ] + + depends_on = [ + "docker_container.ocwa_nginx" ] } diff --git a/terraform/ocwa_policy_api.tf b/terraform/ocwa_policy_api.tf index 868ed1dca..7ddf0487a 100644 --- a/terraform/ocwa_policy_api.tf +++ b/terraform/ocwa_policy_api.tf @@ -1,6 +1,6 @@ data "docker_registry_image" "ocwa_policy_api" { - name = "bcgovimages/ocwa_policy_api:edge" + name = "bcgovimages/ocwa_policy_api${var.images["policy_api"]}" } resource "docker_image" "ocwa_policy_api" { @@ -11,17 +11,21 @@ resource "docker_image" "ocwa_policy_api" { resource "docker_container" "ocwa_policy_api" { image = "${docker_image.ocwa_policy_api.latest}" name = "ocwa_policy_api" + restart = "on-failure" networks_advanced = { name = "${docker_network.private_network.name}" } env = [ + "LOG_LEVEL=info", "JWT_SECRET=${random_string.jwtSecret.result}", "API_SECRET=${random_string.apiSecret.result}", "API_PORT=3004", "DB_HOST=ocwa_mongodb", "DB_NAME=oc_db", + "DB_PORT=27017", "DB_USERNAME=${var.mongodb["username"]}", "DB_PASSWORD=${random_string.mongoSuperPassword.result}", "JWT_AUD=aud", "JWT_ACCESS_GROUP=admin", - "JWT_GROUPS=groups" + "JWT_GROUPS=groups", + "USER_ID_FIELD=email" ] } diff --git a/terraform/ocwa_request_api.tf b/terraform/ocwa_request_api.tf index dca4e8ccb..359c0203d 100644 --- a/terraform/ocwa_request_api.tf +++ b/terraform/ocwa_request_api.tf @@ -1,6 +1,6 @@ data "docker_registry_image" "ocwa_request_api" { - name = "bcgovimages/ocwa_request_api:edge" + name = "bcgovimages/ocwa_request_api${var.images["request_api"]}" } resource "docker_image" "ocwa_request_api" { @@ -11,11 +11,13 @@ resource "docker_image" "ocwa_request_api" { resource "docker_container" "ocwa_request_api" { image = "${docker_image.ocwa_request_api.latest}" name = "ocwa_request_api" + restart = "on-failure" networks_advanced = { name = "${docker_network.private_network.name}" } env = [ "JWT_SECRET=${random_string.jwtSecret.result}", "API_PORT=3002", "DB_HOST=ocwa_mongodb", + "DB_PORT=27017", "DB_NAME=oc_db", "DB_USERNAME=${var.mongodb["username"]}", "DB_PASSWORD=${random_string.mongoSuperPassword.result}", @@ -27,17 +29,19 @@ resource "docker_container" "ocwa_request_api" { "CREATE_ROLE=/exporter", "OC_GROUP=oc", "ALLOW_DENY=true", + "AUTO_APPROVE=false", "VALIDATION_API=http://ocwa_validate_api:3003", "VALIDATION_API_KEY=${random_string.apiSecret.result}", "FORUM_API=http://ocwa_forum_api:3000", "FORUM_API_KEY=${random_string.apiSecret.result}", - "STORAGE_URI=ocwa_minio", + "STORAGE_URI=ocwaminio", "STORAGE_PORT=9000", "STORAGE_USESSL=false", "STORAGE_BUCKET=bucket", "STORAGE_WARN_SIZE=10m", "STORAGE_MAX_SIZE=10m", "STORAGE_KEY=${random_id.accessKey.hex}", - "STORAGE_SECRET=${random_string.secretKey.result}" + "STORAGE_SECRET=${random_string.secretKey.result}" + ] } diff --git a/terraform/ocwa_storage_api.tf b/terraform/ocwa_storage_api.tf index 1dabb0ff6..9a9f71e9b 100644 --- a/terraform/ocwa_storage_api.tf +++ b/terraform/ocwa_storage_api.tf @@ -1,6 +1,6 @@ data "docker_registry_image" "minio" { - name = "minio/minio:latest" + name = "minio/minio${var.images["minio"]}" } resource "docker_image" "minio" { @@ -10,7 +10,8 @@ resource "docker_image" "minio" { resource "docker_container" "minio" { image = "${docker_image.minio.latest}" - name = "ocwa_minio" + name = "ocwaminio" + restart = "on-failure" command = [ "server", "/data" ] networks_advanced = { name = "${docker_network.private_network.name}" } volumes = [{ @@ -28,7 +29,7 @@ resource "docker_container" "minio" { data "docker_registry_image" "tusd" { - name = "tusproject/tusd:latest" + name = "tusproject/tusd${var.images["tusd"]}" } resource "docker_image" "tusd" { @@ -39,7 +40,8 @@ resource "docker_image" "tusd" { resource "docker_container" "tusd" { image = "${docker_image.tusd.latest}" name = "ocwa_tusd" - command = [ "-s3-bucket", "bucket", "-s3-endpoint", "http://ocwa_minio:9000" ] + restart = "on-failure" + command = [ "-behind-proxy", "-s3-bucket", "bucket", "-s3-endpoint", "http://ocwaminio:9000" ] networks_advanced = { name = "${docker_network.private_network.name}" } env = [ "AWS_ACCESS_KEY=${random_id.accessKey.hex}", @@ -49,10 +51,16 @@ resource "docker_container" "tusd" { } resource "null_resource" "minio_first_install" { + provisioner "local-exec" { + command = "scripts/wait-for-healthy.sh ocwaminio" + } + provisioner "local-exec" { environment = { - MC_HOSTS_PRIMARY = "http://${random_id.accessKey.hex}:${random_string.secretKey.result}@ocwa_minio:9000" + MC_HOSTS_PRIMARY = "http://${random_id.accessKey.hex}:${random_string.secretKey.result}@ocwaminio:9000" } command = "docker run -e MC_HOSTS_PRIMARY --net=ocwa_vnet minio/mc mb PRIMARY/bucket" } + + depends_on = [ "docker_container.minio" ] } diff --git a/terraform/ocwa_validate_api.tf b/terraform/ocwa_validate_api.tf index 7711c148e..ea094cbb5 100644 --- a/terraform/ocwa_validate_api.tf +++ b/terraform/ocwa_validate_api.tf @@ -1,6 +1,6 @@ data "docker_registry_image" "ocwa_validate_api" { - name = "bcgovimages/ocwa_validate_api:edge" + name = "bcgovimages/ocwa_validate_api${var.images["validate_api"]}" } resource "docker_image" "ocwa_validate_api" { @@ -11,20 +11,23 @@ resource "docker_image" "ocwa_validate_api" { resource "docker_container" "ocwa_validate_api" { image = "${docker_image.ocwa_validate_api.latest}" name = "ocwa_validate_api" + restart = "on-failure" networks_advanced = { name = "${docker_network.private_network.name}" } env = [ + "LOG_LEVEL=debug", "JWT_SECRET=${random_string.jwtSecret.result}", "API_SECRET=${random_string.apiSecret.result}", "API_PORT=3003", "DB_HOST=ocwa_mongodb", + "DB_PORT=27017", "DB_NAME=oc_db", "DB_USERNAME=${var.mongodb["username"]}", "DB_PASSWORD=${random_string.mongoSuperPassword.result}", "USER_ID_FIELD=email", - "STORAGE_HOST=ocwa_minio", + "STORAGE_HOST=http://ocwaminio:9000", "STORAGE_BUCKET=bucket", "STORAGE_ACCESS_KEY=${random_id.accessKey.hex}", "STORAGE_ACCESS_SECRET=${random_string.secretKey.result}", - "POLICY_URL=ocwa_policy_api:3004" + "POLICY_URL=http://ocwa_policy_api:3004" ] } diff --git a/terraform/postgres.tf b/terraform/postgres.tf index 9c60d5c8a..8ba02f206 100644 --- a/terraform/postgres.tf +++ b/terraform/postgres.tf @@ -19,6 +19,14 @@ resource "docker_container" "ocwa_postgres" { "POSTGRES_PASSWORD=${random_string.postgresSuperPassword.result}" ] networks_advanced = { name = "${docker_network.private_network.name}" } + + healthcheck = { + test = ["CMD-SHELL", "pg_isready -U padmin"] + interval = "5s" + timeout = "5s" + start_period = "5s" + retries = 20 + } } data "template_file" "postgres_script" { @@ -35,6 +43,10 @@ resource "local_file" "postgres_script" { } resource "null_resource" "postgres_first_time_install" { + provisioner "local-exec" { + command = "scripts/wait-for-healthy.sh ocwa_postgres" + } + provisioner "local-exec" { environment = { SCRIPT_PATH = "${var.hostRootPath}" diff --git a/terraform/report.tf b/terraform/report.tf index 7ab74a785..b9be34b5e 100644 --- a/terraform/report.tf +++ b/terraform/report.tf @@ -12,4 +12,21 @@ data "template_file" "report" { resource "local_file" "report_script" { content = "${data.template_file.report.rendered}" filename = "${var.hostRootPath}/config/nginx/www/version/index.html" -} \ No newline at end of file +} + + +data "template_file" "terraform_lock" { + template = "${file("${path.module}/scripts/terraform.lock.tpl")}" + vars = { + requestApiDigest = "${data.docker_registry_image.ocwa_request_api.sha256_digest}" + policyApiDigest = "${data.docker_registry_image.ocwa_policy_api.sha256_digest}" + validateApiDigest = "${data.docker_registry_image.ocwa_validate_api.sha256_digest}" + forumApiDigest = "${data.docker_registry_image.ocwa_forum_api.sha256_digest}" + frontendDigest = "${data.docker_registry_image.ocwa_frontend.sha256_digest}" + } +} + +resource "local_file" "terraform_lock" { + content = "${data.template_file.terraform_lock.rendered}" + filename = "terraform.auto.tfvars.pending" +} diff --git a/terraform/scripts/keycloak-setup.sh b/terraform/scripts/keycloak-setup.sh index dc71c8671..8b418f43b 100755 --- a/terraform/scripts/keycloak-setup.sh +++ b/terraform/scripts/keycloak-setup.sh @@ -13,15 +13,19 @@ echo "Client = $CID" kcadm.sh get clients/$CID -r ocwa -GID=$(kcadm.sh create groups -r ocwa -s name=exporter -i) +GID1=$(kcadm.sh create groups -r ocwa -s name=exporter -i) +GID2=$(kcadm.sh create groups -r ocwa -s name=project_1 -i) -echo "Group = $GID" +echo "Group = $GID1" +echo "Group = $GID2" TUID=$(kcadm.sh create users -r ocwa -s username=testuser -s enabled=true -s email=testuser@nowhere.com -s firstName=TestF -s lastName=TestL -i) echo "User = $TUID" -kcadm.sh update users/$TUID/groups/$GID -r ocwa -s realm=ocwa -s userId=$TUID -s groupId=$GID -n +kcadm.sh update users/$TUID/groups/$GID1 -r ocwa -s realm=ocwa -s userId=$TUID -s groupId=$GID1 -n + +kcadm.sh update users/$TUID/groups/$GID2 -r ocwa -s realm=ocwa -s userId=$TUID -s groupId=$GID2 -n kcadm.sh set-password -r ocwa --username testuser --new-password $TESTUSER_PASSWORD diff --git a/terraform/scripts/mongodb.tpl b/terraform/scripts/mongodb.tpl index 5385f4557..1a6b55a08 100644 --- a/terraform/scripts/mongodb.tpl +++ b/terraform/scripts/mongodb.tpl @@ -8,3 +8,10 @@ db.createUser( db.topics.insert({"name":"topic1", "contributors" : [ ], "author_groups" : [ "/exporter" ]}); db.permissions.insert({"priority":100,"allow":true, "group_ids":["*"], "topic_id":"*"}); + +db.rules.remove({}); +db.rules.insert({name:"warning_file_types", source:"print('$${file.extension}' not in ['sav','dbf','dat','csv','bin','egp'])",mandatory:false}); +db.rules.insert({name:"restricted_file_types", source:"print('$${file.extension}' not in ['zip','tgz','gzip','tar','com','exe','dll','scr','sas7bdat','spv','rda','dta'])",mandatory:true}); + +db.rules.insert({name:"file_size_under_3.5mb", source:"print($${file.size}<3500000)",mandatory:false }); +db.rules.insert({name:"file_size_under_5mb", source:"print($${file.size}<5000000)",mandatory:true }); diff --git a/terraform/scripts/nginx-proxy.tpl b/terraform/scripts/nginx-proxy.tpl index 450007395..26d3741e0 100644 --- a/terraform/scripts/nginx-proxy.tpl +++ b/terraform/scripts/nginx-proxy.tpl @@ -5,7 +5,7 @@ map $http_upgrade $connection_upgrade { server { listen 443 ssl; - server_name authdev.popdata.bc.ca; + server_name ${authHostname}; ssl_certificate ${sslCertificate}; ssl_certificate_key ${sslCertificateKey}; @@ -16,6 +16,7 @@ server { # Proxy everything over to the service location /auth/ { + resolver 127.0.0.11 valid=30s; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -30,7 +31,7 @@ server { server { listen 443 ssl; - server_name ocwadev.popdata.bc.ca; + server_name ${ocwaHostname}; ssl_certificate ${sslCertificate}; ssl_certificate_key ${sslCertificateKey}; @@ -41,6 +42,7 @@ server { } location /minio/ { + resolver 127.0.0.11 valid=30s; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -49,35 +51,47 @@ server { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; - proxy_pass http://ocwa_minio:9000; + proxy_pass http://ocwaminio:9000; } - location /api/v1/files { + location /files { + resolver 127.0.0.11 valid=30s; + proxy_pass http://ocwa_tusd:1080/files; + + # Disable request and response buffering + proxy_request_buffering off; + proxy_buffering off; + proxy_http_version 1.1; + + # Add X-Forwarded-* headers + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; - - proxy_pass ${ocwaHost}/files; + client_max_body_size 0; } - location /files { + # Proxy everything else to the frontend + location /socket { + resolver 127.0.0.11 valid=30s; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; - proxy_pass http://ocwa_tusd:1080/files; + proxy_pass http://ocwa_forum_api:3001/; } # Proxy everything else to the frontend location / { + resolver 127.0.0.11 valid=30s; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -102,30 +116,5 @@ server { server { listen 80 default; - location /files { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - - proxy_pass http://ocwa_tusd:1080/files; - } - - # Proxy everything else to the frontend - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - - proxy_pass http://ocwa_frontend:8000; - } - - # return 301 ${ocwaHost}; + return 301 ${ocwaHost}; } diff --git a/terraform/scripts/terraform.lock.tpl b/terraform/scripts/terraform.lock.tpl new file mode 100644 index 000000000..46db014f9 --- /dev/null +++ b/terraform/scripts/terraform.lock.tpl @@ -0,0 +1,8 @@ + +images = { + request_api = "${requestApiDigest}" + policy_api = "${policyApiDigest}"} + validate_api = "${validateApiDigest}"} + forum_api = "${forumApiDigest}"} + frontend = "${frontendDigest}"} +} diff --git a/terraform/scripts/wait-for-healthy.sh b/terraform/scripts/wait-for-healthy.sh new file mode 100755 index 000000000..99066b485 --- /dev/null +++ b/terraform/scripts/wait-for-healthy.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +for i in {1..30}; do + RESULT=$(docker inspect --format='{{json .State.Health.Status}}' $1) + if [ $RESULT == "\"healthy\"" ]; then + echo "Waiting COMPLETE.. $1 HEALTHY" + exit 0; + else + echo "Waiting.. $RESULT" + fi + sleep 5 +done + +exit 1; diff --git a/terraform/self-signed-cert.tf b/terraform/self-signed-cert.tf new file mode 100644 index 000000000..fde3b3b32 --- /dev/null +++ b/terraform/self-signed-cert.tf @@ -0,0 +1,32 @@ +resource "tls_private_key" "example" { + algorithm = "ECDSA" + ecdsa_curve = "P384" +} + +resource "tls_self_signed_cert" "example" { + key_algorithm = "${tls_private_key.example.algorithm}" + private_key_pem = "${tls_private_key.example.private_key_pem}" + + subject { + common_name = "example.demo" + organization = "ACME Examples, Inc" + } + + validity_period_hours = 12 + + allowed_uses = [ + "key_encipherment", + "digital_signature", + "server_auth", + ] +} + +resource "local_file" "ssl_key" { + content = "${tls_private_key.example.private_key_pem}" + filename = "${var.hostRootPath}/ssl/example.key" +} + +resource "local_file" "ssl_cert" { + content = "${tls_self_signed_cert.example.cert_pem}" + filename = "${var.hostRootPath}/ssl/example.crt" +} diff --git a/terraform/terraform.tfvars.example b/terraform/terraform.tfvars.example new file mode 100644 index 000000000..83ce8ffc5 --- /dev/null +++ b/terraform/terraform.tfvars.example @@ -0,0 +1,33 @@ + +mongodb = { + username = "appuser" +} + +postgres = { + username = "kcuser" +} + +keycloak = { + username = "kcadmin" +} + +ocwaHostname = "ocwa.example.demo" +ocwaHost = "https://ocwa.example.demo" + +ocwaWebSocketHost = "wss://ocwa.example.demo/socket" + +authHostname = "auth.example.demo" +authHost = "https://auth.example.demo" + +sslCertificate = "/ssl/example.crt" +sslCertificateKey = "/ssl/example.key" + +images = { + request_api = ":edge" + validate_api = ":edge" + forum_api = ":edge" + policy_api = ":edge" + frontend = ":edge" + minio = ":latest" + tusd = ":latest" +} diff --git a/terraform/variables.tf b/terraform/variables.tf index 9f099b69d..f8772da1d 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -14,10 +14,22 @@ variable "ocwaHost" { type = "string" } +variable "ocwaHostname" { + type = "string" +} + +variable "ocwaWebSocketHost" { + type = "string" +} + variable "authHost" { type = "string" } +variable "authHostname" { + type = "string" +} + variable "hostRootPath" { type = "string" } @@ -29,3 +41,7 @@ variable "sslCertificate" { variable "sslCertificateKey" { type = "string" } + +variable "images" { + type = "map" +} From b94b9e7e793514a48624bf4250b85926e41b9062 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 14:54:21 -0800 Subject: [PATCH 155/226] Put username and password in globals --- .travis.yml | 42 +++++++++---------- .../groovy/Requester_step_def_ks.groovy | 32 +++++++------- ui_tests/Profiles/Travis.glbl | 2 +- ui_tests/Profiles/default.glbl | 10 +++++ 4 files changed, 48 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45e45d7e8..ce796054a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ matrix: - g++-4.8 before_script: - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json + - cp config/test.json.template config/test.json + - cp config/default.json.template config/default.json - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data @@ -93,13 +93,13 @@ matrix: - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json + - cp config/test.json.template config/test.json + - cp config/default.json.template config/default.json - npm install - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - npm install - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json + - cp config/default.json.template config/default.json + - cp config/test.json.template config/test.json - NODE_ENV=test npm start & - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - chmod +x minio @@ -109,13 +109,13 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.example config/default.json + - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.example config/default.json + - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi @@ -154,7 +154,7 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.example config/default.json + - cp config/default.json.template config/default.json - sudo pip3 install -e . - sudo pytest - wget -q ${HELM_URL}/${HELM_TGZ} @@ -207,11 +207,11 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.example config/default.json + - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.example config/default.json + - cp config/default.json.template config/default.json - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1,validator -m pytest - helm lint helm/validate-api @@ -254,13 +254,13 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.example config/default.json + - cp config/default.json.template config/default.json - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1,validator -m pytest - sudo coverage xml - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.example config/default.json + - cp config/default.json.template config/default.json - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1 -m pytest - sudo coverage xml @@ -302,17 +302,17 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json + - cp config/test.json.template config/test.json + - cp config/default.json.template config/default.json - yarn - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json + - cp config/test.json.template config/test.json + - cp config/default.json.template config/default.json - yarn - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json + - cp config/test.json.template config/test.json - yarn - cd /home/travis/build/bcgov/OCWA/microservices/forumApi @@ -327,13 +327,13 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.example config/default.json + - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - sudo pip3 install -U setuptools - sudo pip3 install -r requirements.txt - - cp config/default.json.example config/default.json + - cp config/default.json.template config/default.json - sudo pip3 install -e . - python3 wsgi.py & - cd /home/travis/build/bcgov/OCWA/microservices/requestApi @@ -457,7 +457,7 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json + - cp config/test.json.template config/test.json - yarn - npm test - helm lint helm/ocwa-frontend diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index fb82a5747..c3f8f4729 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -64,13 +64,13 @@ class Requester_step_def_ks { String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" String LOGOUT_URL = "/auth/logout" - + String g_requestName = "" - + /** * The step definitions below match with Katalon sample Gherkin steps */ - + @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') @@ -82,9 +82,9 @@ class Requester_step_def_ks { WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) - WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), LOGIN_USERNAME) + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), GlobalVariables.OCWA_USER_RESEARCHER) - WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), LOGIN_PWD) + WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), GlobalVariables.OCWA_USER_RESEARCHER_PSWD) WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } @@ -113,18 +113,18 @@ class Requester_step_def_ks { def requester_adds_output_file(String fileToUpload, String secondFile="", String thirdFile="") { TestObject requestFormSaveFilesButton = get_test_object_by_id(REQUEST_SAVE_FILES_BTN_ID) - + WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) TestObject uploadFileButton = get_test_object_by_id(REQUEST_FILES_UPLOAD_BTN_ID) - + WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$fileToUpload") WebUI.delay(5) if (secondFile != "") { WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$secondFile") WebUI.delay(5) } - + if (thirdFile != "") { WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$thirdFile") WebUI.delay(5) @@ -147,11 +147,11 @@ class Requester_step_def_ks { requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) break case "the summation of all output file sizes exceeds the request file size warning threshold": - //need to add output files that pass the warning limit individually but together surpass the combined size threshold - //requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) + //need to add output files that pass the warning limit individually but together surpass the combined size threshold + //requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) break default: - throw new Exception("warning rule $warningRule not found") + throw new Exception("warning rule $warningRule not found") break } } @@ -166,11 +166,11 @@ class Requester_step_def_ks { requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) break case "the summation of all output file sizes exceeds the request file size limit": - //need to add output files that pass the blocked limit individually but together surpass the combined size threshold - //requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) + //need to add output files that pass the blocked limit individually but together surpass the combined size threshold + //requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) break default: - throw new Exception("block rule $blockingRule not found") + throw new Exception("block rule $blockingRule not found") break } } @@ -270,7 +270,7 @@ class Requester_step_def_ks { WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") WebUI.click(get_test_object_by_id(REQUEST_WITHDRAW_BTN_ID)) } - + @When("requester views (.+) requests") def requester_views_requests_of_given_status(String status){ WebUI.navigateToUrl(GlobalVariable.OCWA_URL) @@ -372,7 +372,7 @@ class Requester_step_def_ks { def request_should_be_informed_of_warning_rule_violation(){ //unclear how this is displayed in the UI } - + //Helper function for getting TestObject from the id of an html element def get_test_object_by_id(String id) { TestObject tObject = new TestObject(id) diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index 59e272f7c..e76c46071 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -6,7 +6,7 @@ false - 'http://localhost:8000' + 'https://ocwa.example.demo' OCWA_URL diff --git a/ui_tests/Profiles/default.glbl b/ui_tests/Profiles/default.glbl index f3ed106f1..4bb8b37cc 100644 --- a/ui_tests/Profiles/default.glbl +++ b/ui_tests/Profiles/default.glbl @@ -9,6 +9,16 @@ 'http://localhost:8000' OCWA_URL + + + 'researcher_1' + OCWA_USER_RESEARCHER + + + + 'researcher_1_password' + OCWA_USER_RESEARCHER_PSWD + '/home/travis/build/bcgov/OCWA/ui_tests/test_files/' From e83eb559f204f347ce291fa67789ddfe6b1398a0 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 14:56:41 -0800 Subject: [PATCH 156/226] Added researcher_1 --- terraform/scripts/keycloak-setup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/terraform/scripts/keycloak-setup.sh b/terraform/scripts/keycloak-setup.sh index 8b418f43b..5d68bf113 100755 --- a/terraform/scripts/keycloak-setup.sh +++ b/terraform/scripts/keycloak-setup.sh @@ -30,3 +30,9 @@ kcadm.sh update users/$TUID/groups/$GID2 -r ocwa -s realm=ocwa -s userId=$TUID - kcadm.sh set-password -r ocwa --username testuser --new-password $TESTUSER_PASSWORD # kcadm.sh create users -r ocwa -s username=testuser3 -s enabled=true -s email=testuser3@nowhere.com -s firstName=TestF -s lastName=TestL + +TUID=$(kcadm.sh create users -r ocwa -s username=researcher_1 -s enabled=true -s email=researcher_1@nowhere.com -s firstName=ResF -s lastName=ResL -i) + +kcadm.sh update users/$TUID/groups/$GID1 -r ocwa -s realm=ocwa -s userId=$TUID -s groupId=$GID1 -n +kcadm.sh update users/$TUID/groups/$GID2 -r ocwa -s realm=ocwa -s userId=$TUID -s groupId=$GID2 -n +kcadm.sh set-password -r ocwa --username testuser --new-password researcher_1_password From d333aa44f6a286f15092f952a308455d8a89f6e2 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 14:57:49 -0800 Subject: [PATCH 157/226] Put username and password in globals --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index c3f8f4729..8b0f3fdd9 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -84,7 +84,7 @@ class Requester_step_def_ks { WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), GlobalVariables.OCWA_USER_RESEARCHER) - WebUI.setEncryptedText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), GlobalVariables.OCWA_USER_RESEARCHER_PSWD) + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), GlobalVariables.OCWA_USER_RESEARCHER_PSWD) WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } From 37cdc77fcc4bd679e5eaefc4ab61589bc3d5dc08 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 15:05:43 -0800 Subject: [PATCH 158/226] Fix errors --- .travis.yml | 106 ++++++++++++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce796054a..7170df8bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ matrix: - g++-4.8 before_script: - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.template config/test.json - - cp config/default.json.template config/default.json + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data @@ -93,13 +93,13 @@ matrix: - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.template config/test.json - - cp config/default.json.template config/default.json + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json - npm install - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - npm install - - cp config/default.json.template config/default.json - - cp config/test.json.template config/test.json + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json - NODE_ENV=test npm start & - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - chmod +x minio @@ -227,6 +227,48 @@ matrix: all_branches: true condition: $TRAVIS_BRANCH =~ ^master|develop$ + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.template config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + - name: "Scan - Python" stage: "Tests" python: @@ -302,17 +344,17 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.template config/test.json - - cp config/default.json.template config/default.json + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json - yarn - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.template config/test.json - - cp config/default.json.template config/default.json + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json - yarn - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.template config/test.json + - cp config/test.json.example config/test.json - yarn - cd /home/travis/build/bcgov/OCWA/microservices/forumApi @@ -431,47 +473,7 @@ matrix: - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="default" -browserType="Chrome (headless)" - - name: "Front End" - stage: "Frontend" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.template config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ + env: global: - HELM_URL=https://storage.googleapis.com/kubernetes-helm From e9449aef36a710327266266ac14db0c631e860e8 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 15:23:23 -0800 Subject: [PATCH 159/226] Fix errors --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7170df8bd..54bc61104 100644 --- a/.travis.yml +++ b/.travis.yml @@ -253,7 +253,7 @@ matrix: script: - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.template config/test.json + - cp config/test.json.example config/test.json - yarn - npm test - helm lint helm/ocwa-frontend From 257c2abfcde2e3fda59bf89707c99d061c0b84a9 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 15:57:26 -0800 Subject: [PATCH 160/226] Fix errors with unknown host --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 54bc61104..68b3bb1fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -415,6 +415,9 @@ matrix: - "node" addons: chrome: stable + hosts: + - auth.example.demo + - ocwa.example.demo apt: sources: - ubuntu-toolchain-r-test From 5d5bbf92a458cc175d69918e62057ebc525f5af0 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 16:45:05 -0800 Subject: [PATCH 161/226] typo GlobalVariables --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 8b0f3fdd9..84e433167 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -82,9 +82,9 @@ class Requester_step_def_ks { WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) - WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), GlobalVariables.OCWA_USER_RESEARCHER) + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), GlobalVariable.OCWA_USER_RESEARCHER) - WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), GlobalVariables.OCWA_USER_RESEARCHER_PSWD) + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), GlobalVariable.OCWA_USER_RESEARCHER_PSWD) WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) } From c988d011df82219643e5921b8bd0e68a5ca49a75 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 17:17:08 -0800 Subject: [PATCH 162/226] Correct password for researcher_1 user --- terraform/scripts/keycloak-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/scripts/keycloak-setup.sh b/terraform/scripts/keycloak-setup.sh index 5d68bf113..756d7c2d6 100755 --- a/terraform/scripts/keycloak-setup.sh +++ b/terraform/scripts/keycloak-setup.sh @@ -35,4 +35,4 @@ TUID=$(kcadm.sh create users -r ocwa -s username=researcher_1 -s enabled=true -s kcadm.sh update users/$TUID/groups/$GID1 -r ocwa -s realm=ocwa -s userId=$TUID -s groupId=$GID1 -n kcadm.sh update users/$TUID/groups/$GID2 -r ocwa -s realm=ocwa -s userId=$TUID -s groupId=$GID2 -n -kcadm.sh set-password -r ocwa --username testuser --new-password researcher_1_password +kcadm.sh set-password -r ocwa --username researcher_1 --new-password researcher_1_password From 3b15f8dbe337dee54a6c5680e58c7c9659cc647a Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 22:04:02 -0800 Subject: [PATCH 163/226] Updated travis to use Travis katalon profile --- .travis.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68b3bb1fd..d4eff6964 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,6 @@ addons: token: secure: yoqO9/QRJlT4mcpgQ4RMSg6h97PRnql70EVCcPaBr6nGNaxSmea8K1AxdqFZcC5PMrj+i4oRFrIQIEmOPeJAzh+5wvygXhwsavXR2S0LcTcScXZQQ8ZWXw9exYl5ELt3Ee6BUF4TIGnR3iztp6VGm9mv992Pi7NqYwdIN9z1rVodb/rH3vlBRzxIH6p+eo4cs/rpUatFNDjRnCVvHxDWy2reC43r3Vf61jGR3FFALcah/PrIUDVemY9wqbdqA78HGB97o5UU6Jgwk2qmvUXTxJcyN+7dSi0bhr8SHEGN1TTr7TmOOxFIKy+fPs9krCF8Ll4CruAXu1YLaTRD6Ilxb4U5yUJgjANnsYbR7klD/DC4pwRx1L90cCVbgsNRzrsq+Qvn57bdSoyHGFCSWqQdkW6EG9xcqogMP6y9/DBcgb4SYIMNLjaoqSgunSmDFTFgidHBTcLN6e4mvM89FRDY64i+DINp9gginqHak/LxhNct6LTREx8bcoOA4J28eHY02Cwrtu2pful7uOonZD49XrGW+OfOAQY2c1b91hNJUK+tWPh0B/0CgWyKNize3WclV3pBedFDYzbzeni3TkqoN7Na22xQTl95mrV9vZ7VQpIft0Jlf+OFS+I8s3G2W/Wp/Rhk9tXfxcEa6yvDwxFMv3QsQrs7No3yTRNFw6U3QWs= - hosts: - - auth.example.demo - - ocwa.example.demo - matrix: include: - name: "Forum Api" @@ -443,7 +439,7 @@ matrix: - npm install -g yarn --cache-min 999999999 script: - - cd /home/travis/build/bcgov + - cd /usr/local/bin - curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip - unzip -o terraform_0.11.8_linux_amd64.zip - rm -rf terraform_0.11.8_linux_amd64.zip @@ -452,10 +448,10 @@ matrix: - cd /home/travis/build/bcgov/OCWA/terraform - mkdir _tmp - cp terraform.tfvars.example terraform.tfvars - - /home/travis/build/bcgov/terraform init - - /home/travis/build/bcgov/terraform plan -var hostRootPath=`pwd`/_tmp - - /home/travis/build/bcgov/terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve - - /home/travis/build/bcgov/terraform show + - terraform init + - terraform plan -var hostRootPath=`pwd`/_tmp + - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve + - terraform show - ls -l _tmp - docker ps - sleep 5 @@ -474,7 +470,7 @@ matrix: #RUN Integration Tests - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="default" -browserType="Chrome (headless)" + - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" env: From c52740b9f091bdfd17d64619e165c1adae0c8612 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Thu, 3 Jan 2019 22:34:57 -0800 Subject: [PATCH 164/226] Add ignore ssl for chrome headless in katalon --- .../com.kms.katalon.core.webui.chrome (headless).properties | 1 + 1 file changed, 1 insertion(+) create mode 100644 ui_tests/settings/internal/com.kms.katalon.core.webui.chrome (headless).properties diff --git a/ui_tests/settings/internal/com.kms.katalon.core.webui.chrome (headless).properties b/ui_tests/settings/internal/com.kms.katalon.core.webui.chrome (headless).properties new file mode 100644 index 000000000..765d8ae83 --- /dev/null +++ b/ui_tests/settings/internal/com.kms.katalon.core.webui.chrome (headless).properties @@ -0,0 +1 @@ +{"HEADLESS_DRIVER":{"args":["--whitelisted-ips\u003d","--ignore-certificate-errors"]}} \ No newline at end of file From b9efbe2ddfbc498253943f62f3db360a6e26412c Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 4 Jan 2019 08:57:29 -0800 Subject: [PATCH 165/226] testing for uploading of supporting files --- .../features/requester/draft_requests.feature | 7 +- .../groovy/Requester_step_def_ks.groovy | 82 ++++++++----- .../div_Supporting Files.rs | 112 ++++++++++++++++++ .../test_blocked_max_file_size_limit.txt | 1 + .../test_warning_max_file_size_limit.txt | 1 + 5 files changed, 171 insertions(+), 32 deletions(-) create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/div_Supporting Files.rs create mode 100644 ui_tests/test_files/test_blocked_max_file_size_limit.txt create mode 100644 ui_tests/test_files/test_warning_max_file_size_limit.txt diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature index ecfbb0d1d..14f5e4913 100644 --- a/ui_tests/Include/features/requester/draft_requests.feature +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -5,12 +5,15 @@ As an requester I want to be able to save a draft of my request so that I can do Scenario: Save a draft request (with files) And requester has started a request And requester adds an output file that does not violate any blocking or warning rules + And requester adds supporting files But has not submitted the request When the requester saves their request - Then the requester should be able to re-open the request and pick up where they left off + Then the requester should see their saved request including files + And requester should be able to make changes to the request Scenario: Save a draft request (no files) And requester has started a request But has not submitted the request When the requester saves their request - Then the requester should be able to re-open the request and pick up where they left off \ No newline at end of file + Then the requester should see their saved request + And requester should be able to make changes to the request \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index fb82a5747..699fe1d48 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -64,13 +64,13 @@ class Requester_step_def_ks { String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" String LOGOUT_URL = "/auth/logout" - + String g_requestName = "" - + /** * The step definitions below match with Katalon sample Gherkin steps */ - + @Given("requester has logged in") def requester_login() { WebUI.openBrowser('') @@ -110,21 +110,24 @@ class Requester_step_def_ks { def requester_has_not_submitted_new_request() { } - def requester_adds_output_file(String fileToUpload, String secondFile="", String thirdFile="") { + // parameterized function for uploading 1 to 3 output or supporting files + def requester_uploads_files(String fileToUpload, boolean isUploadScreenAlreadyOpen = false, String secondFile="", String thirdFile="") { + + if (!isUploadScreenAlreadyOpen) { + TestObject requestFormSaveFilesButton = get_test_object_by_id(REQUEST_SAVE_FILES_BTN_ID) + WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) + WebUI.click(requestFormSaveFilesButton) + } - TestObject requestFormSaveFilesButton = get_test_object_by_id(REQUEST_SAVE_FILES_BTN_ID) - - WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) - WebUI.click(requestFormSaveFilesButton) + //Upload files TestObject uploadFileButton = get_test_object_by_id(REQUEST_FILES_UPLOAD_BTN_ID) - WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$fileToUpload") WebUI.delay(5) if (secondFile != "") { WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$secondFile") WebUI.delay(5) } - + if (thirdFile != "") { WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$thirdFile") WebUI.delay(5) @@ -133,7 +136,13 @@ class Requester_step_def_ks { @Given("requester adds an output file that does not violate any blocking or warning rules") def requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules(){ - requester_adds_output_file(GlobalVariable.ValidFileName) + requester_uploads_files(GlobalVariable.ValidFileName, false, GlobalVariable.BlockedExtensionFileName) + } + + @Given("requester adds supporting files") + def requester_adds_supporting_files(){ + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/div_Supporting Files')) + requester_uploads_files(GlobalVariable.WarningExtensionFileName, true, GlobalVariable.BlockedMaxSizeLimitFileName) } @Given("request violates given warning rule (.+)") @@ -141,17 +150,17 @@ class Requester_step_def_ks { requester_starts_new_request() switch (warningRule.toLowerCase()) { case "an output file has a warning file extension": - requester_adds_output_file(GlobalVariable.WarningExtensionFileName) + requester_uploads_files(GlobalVariable.WarningExtensionFileName) break case "a request that has a file that exceeds the file size warning threshold": - requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) + requester_uploads_files(GlobalVariable.WarningMaxSizeLimitFileName) break case "the summation of all output file sizes exceeds the request file size warning threshold": - //need to add output files that pass the warning limit individually but together surpass the combined size threshold - //requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) + //need to add output files that pass the warning limit individually but together surpass the combined size threshold + //requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) break default: - throw new Exception("warning rule $warningRule not found") + throw new Exception("warning rule $warningRule not found") break } } @@ -160,17 +169,17 @@ class Requester_step_def_ks { requester_starts_new_request() switch (blockingRule.toLowerCase()) { case "an output file has a blocked file extension": - requester_adds_output_file(GlobalVariable.BlockedExtensionFileName) + requester_uploads_files(GlobalVariable.BlockedExtensionFileName) break case "a request that has a file that is too big": - requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) + requester_uploads_files(GlobalVariable.BlockedMaxSizeLimitFileName) break case "the summation of all output file sizes exceeds the request file size limit": - //need to add output files that pass the blocked limit individually but together surpass the combined size threshold - //requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) + //need to add output files that pass the blocked limit individually but together surpass the combined size threshold + //requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) break default: - throw new Exception("block rule $blockingRule not found") + throw new Exception("block rule $blockingRule not found") break } } @@ -270,7 +279,7 @@ class Requester_step_def_ks { WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") WebUI.click(get_test_object_by_id(REQUEST_WITHDRAW_BTN_ID)) } - + @When("requester views (.+) requests") def requester_views_requests_of_given_status(String status){ WebUI.navigateToUrl(GlobalVariable.OCWA_URL) @@ -293,16 +302,29 @@ class Requester_step_def_ks { } } - - @Then("the requester should be able to re-open the request and pick up where they left off") - def confirm_draft_save_was_successful() { - WebUI.waitForPageLoad(20) - WebUI.delay(5) + @Then("the requester should see their saved request(.*)") + def confirm_draft_save_was_successful(String additionalCriteria){ + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + //WebUI.waitForPageLoad(20) + //WebUI.delay(5) WebUI.verifyTextPresent(g_requestName, false) - WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$LOGOUT_URL") - WebUI.closeBrowser() + + if (additionalCriteria != null) { + WebUI.verifyTextPresent(GlobalVariable.ValidFileName, false) + WebUI.verifyTextPresent(GlobalVariable.WarningExtensionFileName, false) + WebUI.verifyTextPresent(GlobalVariable.BlockedExtensionFileName, false) + WebUI.verifyTextPresent(GlobalVariable.BlockedMaxSizeLimitFileName, false) + } } + // @Then("the requester should be able to re-open the request and pick up where they left off") + // def confirm_request_editable() { + // + // WebUI.delay(3) + // WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$LOGOUT_URL") + // WebUI.closeBrowser() + // } + @Then("the requester should not be able to submit the request") def requester_is_not_able_to_submit_request(){ WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) @@ -372,7 +394,7 @@ class Requester_step_def_ks { def request_should_be_informed_of_warning_rule_violation(){ //unclear how this is displayed in the UI } - + //Helper function for getting TestObject from the id of an html element def get_test_object_by_id(String id) { TestObject tObject = new TestObject(id) diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/div_Supporting Files.rs b/ui_tests/Object Repository/Page_OCWA Development Version/div_Supporting Files.rs new file mode 100644 index 000000000..d9560e670 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/div_Supporting Files.rs @@ -0,0 +1,112 @@ + + + + div_Supporting Files + + 5d640c1d-9c81-4c02-b326-7118d8835639 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Export Files'])[2]/following::div[1] + + + BASIC + //div[(text() = 'Supporting Files' or . = 'Supporting Files')] + + + BASIC + false + + true + equals + tag + Main + div + + + false + equals + class + Main + styled__NavItem-sc-716rt7-5 goIJer + + + false + equals + aria-posinset + Main + 2 + + + false + equals + aria-selected + Main + false + + + false + equals + aria-setsize + Main + 2 + + + false + equals + role + Main + tab + + + false + equals + tabindex + Main + -1 + + + true + equals + text + Main + Supporting Files + + + false + equals + xpath + Main + /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-bYTsla fmtIoj"]/div[3]/div[@class="sc-dlyikq GLHwQ"]/div[@class="sc-fFTYTi fSgdLK"]/div[@class="sc-dPNhBE dnRgTD"]/div[@class="sc-iLVFha cSvgHR"]/div[@class="file-uploader src-modules-requests-components-file-uploader-styles_container--1X6YaoF7"]/nav[@class="src-modules-requests-components-file-uploader-styles_nav--3cu5Tn5v"]/div[@class="styled__Tabs-sc-716rt7-0 iphdyc"]/div[@class="styled__NavWrapper-sc-716rt7-2 bdCvri"]/div[@class="styled__Nav-sc-716rt7-3 bZoCUn"]/div[@class="styled__NavItem-sc-716rt7-5 goIJer"] + + + true + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Export Files'])[2]/following::div[1] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Initiate a New Request (Step 2/2)'])[1]/following::div[7] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Or'])[1]/preceding::div[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Upload Files'])[1]/preceding::div[2] + + + false + equals + xpath:position + //nav/div/div/div/div[2] + + diff --git a/ui_tests/test_files/test_blocked_max_file_size_limit.txt b/ui_tests/test_files/test_blocked_max_file_size_limit.txt new file mode 100644 index 000000000..9132c66b7 --- /dev/null +++ b/ui_tests/test_files/test_blocked_max_file_size_limit.txt @@ -0,0 +1 @@ +asdfasdfasdf \ No newline at end of file diff --git a/ui_tests/test_files/test_warning_max_file_size_limit.txt b/ui_tests/test_files/test_warning_max_file_size_limit.txt new file mode 100644 index 000000000..9132c66b7 --- /dev/null +++ b/ui_tests/test_files/test_warning_max_file_size_limit.txt @@ -0,0 +1 @@ +asdfasdfasdf \ No newline at end of file From 46af98ce7d2f68420553ab22c6ee630a05869380 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Fri, 4 Jan 2019 09:48:10 -0800 Subject: [PATCH 166/226] Fixed terraform error in travis pipeline --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4eff6964..56955238d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -440,10 +440,10 @@ matrix: script: - cd /usr/local/bin - - curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip - - unzip -o terraform_0.11.8_linux_amd64.zip - - rm -rf terraform_0.11.8_linux_amd64.zip - - chmod +x terraform + - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip + - sudo unzip -o terraform_0.11.8_linux_amd64.zip + - sudo rm -rf terraform_0.11.8_linux_amd64.zip + - sudo chmod +x terraform - cd /home/travis/build/bcgov/OCWA/terraform - mkdir _tmp From 42dc8ee62abd9dbc095ad5fb0362328024a59eb8 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 4 Jan 2019 10:43:51 -0800 Subject: [PATCH 167/226] changed blocked ext file to be a zip; fixed request nav issue --- .../groovy/Requester_step_def_ks.groovy | 25 ++++++++++++++----- ui_tests/Profiles/default.glbl | 7 +++++- .../test_blocked_file_extension.zip | 1 + .../test_files/test_valid_file_upload2.txt | 4 +++ 4 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 ui_tests/test_files/test_blocked_file_extension.zip create mode 100644 ui_tests/test_files/test_valid_file_upload2.txt diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 5a271753f..0ec1bd509 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -257,7 +257,8 @@ class Requester_step_def_ks { @When("requester writes and submits a new comment") def requester_creates_a_new_comment(){ - WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + requester_views_request_they_created() WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), TEST_COMMENT) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Save (1)')) @@ -265,18 +266,22 @@ class Requester_step_def_ks { @When("the requester views the request") def requester_views_request_they_created(){ - WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + WebUI.click(get_test_object_by_text(g_requestName)) + //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") } @When("the requester cancels the request") def requester_cancels_request(){ - WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + requester_views_request_they_created() WebUI.click(get_test_object_by_id(REQUEST_CANCEL_BTN_ID)) } @When("the requester withdraws the request") def requester_withdraws_request(){ - WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + requester_views_request_they_created() WebUI.click(get_test_object_by_id(REQUEST_WITHDRAW_BTN_ID)) } @@ -304,7 +309,8 @@ class Requester_step_def_ks { @Then("the requester should see their saved request(.*)") def confirm_draft_save_was_successful(String additionalCriteria){ - WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + requester_views_request_they_created() + //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") //WebUI.waitForPageLoad(20) //WebUI.delay(5) WebUI.verifyTextPresent(g_requestName, false) @@ -372,7 +378,8 @@ class Requester_step_def_ks { @Then("requester should be able to make changes to the request") def requester_should_be_able_to_make_changes_to_the_request(){ - WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + requester_views_request_they_created() WebUI.click(get_test_object_by_id(REQUEST_EDIT_BTN_ID)) WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), EDITED_PURPOSE_TEXT) } @@ -401,5 +408,11 @@ class Requester_step_def_ks { tObject.addProperty("id", ConditionType.EQUALS, id, true) return tObject } + //Helper function for getting TestObject from the text of an html element + def get_test_object_by_text(String t) { + TestObject tObject = new TestObject(t) + tObject.addProperty("text", ConditionType.EQUALS, t, true) + return tObject + } } \ No newline at end of file diff --git a/ui_tests/Profiles/default.glbl b/ui_tests/Profiles/default.glbl index 4bb8b37cc..94e62c4b4 100644 --- a/ui_tests/Profiles/default.glbl +++ b/ui_tests/Profiles/default.glbl @@ -36,7 +36,7 @@ - 'test_blocked_file_extension.exe' + 'test_blocked_file_extension.scr' BlockedExtensionFileName @@ -59,4 +59,9 @@ 'test_study_ids_in_file.txt' BlockedStudyIDFileName + + + 'test_valid_file_upload2.txt' + ValidFileName2 + diff --git a/ui_tests/test_files/test_blocked_file_extension.zip b/ui_tests/test_files/test_blocked_file_extension.zip new file mode 100644 index 000000000..23a3a9d59 --- /dev/null +++ b/ui_tests/test_files/test_blocked_file_extension.zip @@ -0,0 +1 @@ +asdfasdf \ No newline at end of file diff --git a/ui_tests/test_files/test_valid_file_upload2.txt b/ui_tests/test_files/test_valid_file_upload2.txt new file mode 100644 index 000000000..392512354 --- /dev/null +++ b/ui_tests/test_files/test_valid_file_upload2.txt @@ -0,0 +1,4 @@ +Project Entity ID,Accident type,Accident Date +3d3bc539-9aec-45e0-96a3-4e851068d5e2,motor vehicle,2/26/2019 +2fc94c19-78d8-42a4-8e1a-0d8103340c72,recreational sport,3/15/2019 +a4832b32-25ac-41fc-96ca-7be5753b98b8,motor vehicle,4/22/2019 \ No newline at end of file From 875f32ef0777fef2295d419960fefdc0eeea3092 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 4 Jan 2019 10:50:24 -0800 Subject: [PATCH 168/226] fixed extension of blocked extension text file --- ui_tests/Profiles/default.glbl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_tests/Profiles/default.glbl b/ui_tests/Profiles/default.glbl index 94e62c4b4..7adce4d3b 100644 --- a/ui_tests/Profiles/default.glbl +++ b/ui_tests/Profiles/default.glbl @@ -36,7 +36,7 @@ - 'test_blocked_file_extension.scr' + 'test_blocked_file_extension.zip' BlockedExtensionFileName From a090ad9d530664c3fc767ab77881ea2d91339a01 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 4 Jan 2019 11:35:53 -0800 Subject: [PATCH 169/226] updated travis to use the default profile --- .travis.yml | 2 +- ui_tests/Profiles/Travis.glbl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56955238d..f50274d57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -470,7 +470,7 @@ matrix: #RUN Integration Tests - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" + - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="default" -browserType="Chrome (headless)" env: diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index e76c46071..a38750246 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -26,7 +26,7 @@ - 'test_blocked_file_extension.exe' + 'test_blocked_file_extension.zip' BlockedExtensionFileName From eaf53fa6f409fac085acff4f2f6c9c17e7630abb Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Fri, 4 Jan 2019 12:11:32 -0800 Subject: [PATCH 170/226] Reverted travis to use Travis profile --- .travis.yml | 2 +- ui_tests/Profiles/Travis.glbl | 35 ----------------------------------- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index f50274d57..56955238d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -470,7 +470,7 @@ matrix: #RUN Integration Tests - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="default" -browserType="Chrome (headless)" + - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" env: diff --git a/ui_tests/Profiles/Travis.glbl b/ui_tests/Profiles/Travis.glbl index a38750246..19b73dd2b 100644 --- a/ui_tests/Profiles/Travis.glbl +++ b/ui_tests/Profiles/Travis.glbl @@ -14,39 +14,4 @@ '/home/travis/build/bcgov/OCWA/ui_tests/test_files/' TestFilePath - - - 'test_valid_file_upload.txt' - ValidFileName - - - - 'test_warning_extension.csv' - WarningExtensionFileName - - - - 'test_blocked_file_extension.zip' - BlockedExtensionFileName - - - - 'test_min_file_size_limit.txt' - MinSizeLimitFileName - - - - 'test_warning_max_file_size_limit.txt' - WarningMaxSizeLimitFileName - - - - 'test_blocked_max_file_size_limit.txt' - BlockedMaxSizeLimitFileName - - - - 'test_study_ids_in_file.txt' - BlockedStudyIDFileName - From f834495e5a908c51ac49ecdee83c79ba1ecb9c48 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 4 Jan 2019 13:09:31 -0800 Subject: [PATCH 171/226] added a delay for loading main page before searching for request --- .../scripts/groovy/Requester_step_def_ks.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 0ec1bd509..ff1c02769 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -136,7 +136,7 @@ class Requester_step_def_ks { @Given("requester adds an output file that does not violate any blocking or warning rules") def requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules(){ - requester_uploads_files(GlobalVariable.ValidFileName, false, GlobalVariable.BlockedExtensionFileName) + requester_uploads_files(GlobalVariable.ValidFileName, false, GlobalVariable.ValidFileName2) } @Given("requester adds supporting files") @@ -311,15 +311,15 @@ class Requester_step_def_ks { def confirm_draft_save_was_successful(String additionalCriteria){ requester_views_request_they_created() //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") - //WebUI.waitForPageLoad(20) - //WebUI.delay(5) + WebUI.waitForPageLoad(20) + WebUI.delay(5) WebUI.verifyTextPresent(g_requestName, false) if (additionalCriteria != null) { WebUI.verifyTextPresent(GlobalVariable.ValidFileName, false) - WebUI.verifyTextPresent(GlobalVariable.WarningExtensionFileName, false) - WebUI.verifyTextPresent(GlobalVariable.BlockedExtensionFileName, false) - WebUI.verifyTextPresent(GlobalVariable.BlockedMaxSizeLimitFileName, false) + //WebUI.verifyTextPresent(GlobalVariable.WarningExtensionFileName, false) + WebUI.verifyTextPresent(GlobalVariable.ValidFileName2, false) + //WebUI.verifyTextPresent(GlobalVariable.BlockedMaxSizeLimitFileName, false) } } From b5c2e617f82b94520983b371b30214db549a711b Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 4 Jan 2019 13:39:34 -0800 Subject: [PATCH 172/226] add a delay when the main page loads before trying to click link --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index ff1c02769..564b7241e 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -267,6 +267,8 @@ class Requester_step_def_ks { @When("the requester views the request") def requester_views_request_they_created(){ WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + WebUI.waitForPageLoad(20) + WebUI.delay(2) WebUI.click(get_test_object_by_text(g_requestName)) //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") } From 8b87d61ab3f02a682d0fba6b59ca7e9ec1e1d656 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 7 Jan 2019 16:14:35 -0800 Subject: [PATCH 173/226] added steps for team sharing testing; added sample supporting files --- ..._approved_output_files_outside_SRE.feature | 12 +-- .../features/requester/draft_requests.feature | 25 ++--- .../requester/request_discussion.feature | 8 +- ...edit_project_team_members_requests.feature | 28 +++--- .../groovy/Requester_step_def_ks.groovy | 98 +++++++++++++------ .../div_Export FilesSupporting Fil.rs | 61 ++++++++++++ ui_tests/Profiles/default.glbl | 20 ++++ ui_tests/test_files/test_supporting_file.txt | 1 + ui_tests/test_files/test_supporting_file2.txt | 1 + .../test_files/test_valid_file_upload.txt | 2 +- 10 files changed, 189 insertions(+), 67 deletions(-) create mode 100644 ui_tests/Object Repository/Page_OCWA Development Version/div_Export FilesSupporting Fil.rs create mode 100644 ui_tests/test_files/test_supporting_file.txt create mode 100644 ui_tests/test_files/test_supporting_file2.txt diff --git a/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature b/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature index f4951feff..850cd2ba3 100644 --- a/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature +++ b/ui_tests/Include/features/requester/access_approved_output_files_outside_SRE.feature @@ -1,7 +1,7 @@ -Feature: Access approved output files outside of the secure environment -As an requester I want to be able to access approved output files outside of the secure environment so that I can share my results with others - Scenario: Access approved request outside of the SRE - Given requester has logged in (outside of SRE) - And requester has an approved request - When requester views their request's approved files +Feature: Access approved output files outside of the secure environment +As an requester I want to be able to access approved output files outside of the secure environment so that I can share my results with others + Scenario: Access approved request outside of the SRE + Given requester has a request of status "Approved" + And requester has logged in (outside of SRE) + When requester views their request's approved files Then requester can copy their approved files to their local computer \ No newline at end of file diff --git a/ui_tests/Include/features/requester/draft_requests.feature b/ui_tests/Include/features/requester/draft_requests.feature index 14f5e4913..d9821a690 100644 --- a/ui_tests/Include/features/requester/draft_requests.feature +++ b/ui_tests/Include/features/requester/draft_requests.feature @@ -2,18 +2,21 @@ Feature: Draft requests As an requester I want to be able to save a draft of my request so that I can don't have to fill out the request form all at once Background: Given requester has logged in - Scenario: Save a draft request (with files) And requester has started a request - And requester adds an output file that does not violate any blocking or warning rules - And requester adds supporting files - But has not submitted the request + Scenario: Save a draft request (no files) When the requester saves their request - Then the requester should see their saved request including files + Then the requester should see their saved request including 0 output file 0 supporting file And requester should be able to make changes to the request - - Scenario: Save a draft request (no files) - And requester has started a request - But has not submitted the request + Scenario: Save a draft request (1 output file) + And requester adds 1 output file that does not violate any blocking or warning rules When the requester saves their request - Then the requester should see their saved request - And requester should be able to make changes to the request \ No newline at end of file + Then the requester should see their saved request including 1 output file 0 supporting file + And requester should be able to make changes to the request + Scenario: Save a draft request (1 output file, 1 supporting file) + And requester adds 1 output file that does not violate any blocking or warning rules + And requester adds 1 supporting files + When the requester saves their request + Then the requester should see their saved request including 1 output file 1 supporting file + And requester should be able to make changes to the request + + \ No newline at end of file diff --git a/ui_tests/Include/features/requester/request_discussion.feature b/ui_tests/Include/features/requester/request_discussion.feature index 52e50d7c3..a843f1bca 100644 --- a/ui_tests/Include/features/requester/request_discussion.feature +++ b/ui_tests/Include/features/requester/request_discussion.feature @@ -7,9 +7,11 @@ Feature: Discussion about a request And the request has been claimed by an output checker When requester writes and submits a new comment Then requester should see their new comment displayed - And the output checker assigned to the request should be notified of the new comment + And output checker assigned to the request should be notified of the new comment + And output checker should be able to see the new comment Scenario: Output checker adds a new comment about request Given output checker has logged in When output checker writes and submits a new comment - Then the output checker should see their new comment displayed - And the requester(s) associated to the request should be notified of the new comment \ No newline at end of file + Then output checker should see their new comment displayed + And requester associated to the request should be notified of the new comment + And requester should be able to see the new comment \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature b/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature index 7e42638e3..e3e3e8f8b 100644 --- a/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature +++ b/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature @@ -1,15 +1,13 @@ -Feature: seeing / editing project team members requests -As an requester I need the ability to see / edit my team member's requests so that I can more easily collaborate with my fellow team members - Background: - Given requester has logged in - And the requester is a member of a project team - And another project team member has created a request - And the project has team sharing enabled - Scenario: View / edit a team member's request in a project that allows editing of team member's requests - Given the requester's project allows for editing of team member's requests - When the requester views their requests - Then the team member's request should be visible and editable - Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests - Given the requester's project does not allow for editing of team member's requests - When the requester views their requests - Then the team member's request should not be visible or editable \ No newline at end of file +Feature: seeing / editing project team members requests +As an requester I need the ability to see / edit my team member's requests so that I can more easily collaborate with my fellow team members + Background: + Given a project team member has created a request + And requester has logged in + Scenario: View / edit a team member's request in a project that allows editing of team member's requests + Given requester's project allows for editing of team member's requests + When requester views their requests + Then the team member's request should be visible and editable + Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests + Given requester's project does not allow for editing of team member's requests + When requester views their requests + Then the team member's request should not be visible \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 564b7241e..96f9b9e25 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -73,6 +73,10 @@ class Requester_step_def_ks { @Given("requester has logged in") def requester_login() { + login(GlobalVariable.OCWA_USER_RESEARCHER, GlobalVariable.OCWA_USER_RESEARCHER_PSWD) + } + + def login(String username, String password){ WebUI.openBrowser('') WebUI.delay(5) @@ -82,11 +86,12 @@ class Requester_step_def_ks { WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) - WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), GlobalVariable.OCWA_USER_RESEARCHER) + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Username or email_userna'), username) - WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), GlobalVariable.OCWA_USER_RESEARCHER_PSWD) + WebUI.setText(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_password'), password) WebUI.click(findTestObject('Object Repository/Page_Log in to ocwa/input_Password_login')) + } @Given("requester has started a request") @@ -99,10 +104,11 @@ class Requester_step_def_ks { WebUI.waitForElementClickable(newRequestButtonObject, 30) WebUI.click(newRequestButtonObject) + WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), PURPOSE_TEXT) g_requestName = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), g_requestName) - WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), PURPOSE_TEXT) + WebUI.delay(2) } @@ -134,15 +140,25 @@ class Requester_step_def_ks { } } - @Given("requester adds an output file that does not violate any blocking or warning rules") - def requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules(){ - requester_uploads_files(GlobalVariable.ValidFileName, false, GlobalVariable.ValidFileName2) + @Given("requester adds (.+) output file that does not violate any blocking or warning rules") + def requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules(String numOutputFilesToUpload){ + if (numOutputFilesToUpload == "2") { //add 2 valid output files + requester_uploads_files(GlobalVariable.ValidFileName, false, GlobalVariable.ValidFileName2) + } + else { //add 1 valid output file + requester_uploads_files(GlobalVariable.ValidFileName, false) + } } - @Given("requester adds supporting files") - def requester_adds_supporting_files(){ + @Given("requester adds (.+) supporting files") + def requester_adds_supporting_files(String numSupportingFilesToUpload){ WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/div_Supporting Files')) - requester_uploads_files(GlobalVariable.WarningExtensionFileName, true, GlobalVariable.BlockedMaxSizeLimitFileName) + if (numSupportingFilesToUpload == "1") { + requester_uploads_files(GlobalVariable.SupportingFileName, true) + } + else { //add 2 supporting files + requester_uploads_files(GlobalVariable.SupportingFileName, true, GlobalVariable.SupportingFileName2) + } } @Given("request violates given warning rule (.+)") @@ -192,7 +208,7 @@ class Requester_step_def_ks { @Given("requester has submitted a request") def requester_has_submitted_a_request(){ requester_starts_new_request() - requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules() + requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules("1") requester_submits_request() } @@ -212,7 +228,7 @@ class Requester_step_def_ks { switch (status.toLowerCase()) { case "draft": requester_starts_new_request() - requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules() + requester_adds_output_file_that_does_not_violate_blocking_or_warning_rules("1") requester_saves_new_request() break case "awaiting review": @@ -241,6 +257,19 @@ class Requester_step_def_ks { } } + @Given("a project team member has created a request") + def project_team_member_has_created_request() { + login(GlobalVariable.OCWA_USER_TEAM_MEMBER, GlobalVariable.OCWA_USER_TEAM_MEMBER_PSWD) + requester_has_a_request_of_status("draft") + WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$LOGOUT_URL") + } + + @Given("requester's project allows for editing of team member's requests") + def project_allows_for_team_sharing(){} + + @Given("requester's project does not allow for editing of team member's requests") + def project_does_not_allow_for_team_sharing(){} + @When("the requester saves their request") def requester_saves_new_request() { WebUI.click(get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID)) @@ -257,7 +286,6 @@ class Requester_step_def_ks { @When("requester writes and submits a new comment") def requester_creates_a_new_comment(){ - //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") requester_views_request_they_created() WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/div_'), TEST_COMMENT) @@ -270,19 +298,16 @@ class Requester_step_def_ks { WebUI.waitForPageLoad(20) WebUI.delay(2) WebUI.click(get_test_object_by_text(g_requestName)) - //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") } @When("the requester cancels the request") def requester_cancels_request(){ - //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") requester_views_request_they_created() WebUI.click(get_test_object_by_id(REQUEST_CANCEL_BTN_ID)) } @When("the requester withdraws the request") def requester_withdraws_request(){ - //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") requester_views_request_they_created() WebUI.click(get_test_object_by_id(REQUEST_WITHDRAW_BTN_ID)) } @@ -303,36 +328,38 @@ class Requester_step_def_ks { case "cancelled": WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Cancelled')) break + case "their": //essentially viewing all their requests + break default: throw new Exception("status $status not found") break } } - @Then("the requester should see their saved request(.*)") - def confirm_draft_save_was_successful(String additionalCriteria){ + @Then("the requester should see their saved request including (.+) output file (.+) supporting file") + def confirm_draft_save_was_successful(String numOutputFiles, String numSupportingFiles){ requester_views_request_they_created() - //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") + WebUI.waitForPageLoad(20) WebUI.delay(5) WebUI.verifyTextPresent(g_requestName, false) - if (additionalCriteria != null) { + if (numOutputFiles == "1") { WebUI.verifyTextPresent(GlobalVariable.ValidFileName, false) - //WebUI.verifyTextPresent(GlobalVariable.WarningExtensionFileName, false) + } + if (numOutputFiles == "2") { WebUI.verifyTextPresent(GlobalVariable.ValidFileName2, false) - //WebUI.verifyTextPresent(GlobalVariable.BlockedMaxSizeLimitFileName, false) + WebUI.verifyTextPresent(GlobalVariable.ValidFileName, false) + } + if (numSupportingFiles == "1") { + WebUI.verifyTextPresent(GlobalVariable.SupportingFileName, false) + } + if (numSupportingFiles == "2") { + WebUI.verifyTextPresent(GlobalVariable.SupportingFileName2, false) + WebUI.verifyTextPresent(GlobalVariable.SupportingFileName, false) } } - // @Then("the requester should be able to re-open the request and pick up where they left off") - // def confirm_request_editable() { - // - // WebUI.delay(3) - // WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$LOGOUT_URL") - // WebUI.closeBrowser() - // } - @Then("the requester should not be able to submit the request") def requester_is_not_able_to_submit_request(){ WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) @@ -359,7 +386,6 @@ class Requester_step_def_ks { @Then('the request status is changed to "(.+)"') def request_should_be_in_given_status(String status){ - //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") WebUI.verifyTextPresent(status, false) WebUI.closeBrowser() } @@ -380,7 +406,6 @@ class Requester_step_def_ks { @Then("requester should be able to make changes to the request") def requester_should_be_able_to_make_changes_to_the_request(){ - //WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$REQUEST_PATH$g_requestName") requester_views_request_they_created() WebUI.click(get_test_object_by_id(REQUEST_EDIT_BTN_ID)) WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), EDITED_PURPOSE_TEXT) @@ -404,6 +429,17 @@ class Requester_step_def_ks { //unclear how this is displayed in the UI } + @Then("the team member's request should be visible and editable") + def team_members_request_should_be_editable() { + requester_should_be_able_to_make_changes_to_the_request() + } + + @Then("the team member's request should not be visible") + def team_members_request_should_not_be_visible(){ + WebUI.verifyTextNotPresent(g_requestName, false) + WebUI.closeBrowser() + } + //Helper function for getting TestObject from the id of an html element def get_test_object_by_id(String id) { TestObject tObject = new TestObject(id) diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/div_Export FilesSupporting Fil.rs b/ui_tests/Object Repository/Page_OCWA Development Version/div_Export FilesSupporting Fil.rs new file mode 100644 index 000000000..8c8ebaea0 --- /dev/null +++ b/ui_tests/Object Repository/Page_OCWA Development Version/div_Export FilesSupporting Fil.rs @@ -0,0 +1,61 @@ + + + + div_Export FilesSupporting Fil + + ac562952-2014-43ce-b432-1843138d29f7 + + + XPATH + (.//*[normalize-space(text()) and normalize-space(.)='Initiate a New Request (Step 2/2)'])[1]/following::div[2] + + + XPATH + false + + true + equals + tag + Main + div + + + false + equals + class + Main + file-uploader src-modules-requests-components-file-uploader-styles_container--1X6YaoF7 + + + true + equals + text + Main + Export FilesSupporting FilesDrag Support Files from your computer hereOrUpload FilesHeads up! Make sure you save your request after uploading to enable submission.Uploaded FilesFile NameFile TypeFile SizeDate Modifiedhospital_visits_bc_2017_old.csvapplication/vnd.ms-excel1.03 KBApr 19th, 2018 + + + false + equals + xpath + Main + /html[1]/body[1]/div[@class="atlaskit-portal"]/div[@class="sc-bYTsla fmtIoj"]/div[3]/div[@class="sc-dlyikq GLHwQ"]/div[@class="sc-fFTYTi fSgdLK"]/div[@class="sc-dPNhBE dnRgTD"]/div[@class="sc-iLVFha cSvgHR"]/div[@class="file-uploader src-modules-requests-components-file-uploader-styles_container--1X6YaoF7"] + + + true + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Initiate a New Request (Step 2/2)'])[1]/following::div[2] + + + false + equals + xpath:neighbor + (.//*[normalize-space(text()) and normalize-space(.)='Flag notifications'])[1]/following::div[15] + + + false + equals + xpath:position + //div[3]/div[2]/div/div/div[2]/div + + diff --git a/ui_tests/Profiles/default.glbl b/ui_tests/Profiles/default.glbl index 7adce4d3b..ce8e5aa47 100644 --- a/ui_tests/Profiles/default.glbl +++ b/ui_tests/Profiles/default.glbl @@ -64,4 +64,24 @@ 'test_valid_file_upload2.txt' ValidFileName2 + + + 'test_supporting_file.txt' + SupportingFileName + + + + 'test_supporting_file2.txt' + SupportingFileName2 + + + + 'team_member_1' + OCWA_USER_TEAM_MEMBER + + + + 'team_member_1_password' + OCWA_USER_TEAM_MEMBER_PSWD + diff --git a/ui_tests/test_files/test_supporting_file.txt b/ui_tests/test_files/test_supporting_file.txt new file mode 100644 index 000000000..a7f334593 --- /dev/null +++ b/ui_tests/test_files/test_supporting_file.txt @@ -0,0 +1 @@ +quack quack quack diff --git a/ui_tests/test_files/test_supporting_file2.txt b/ui_tests/test_files/test_supporting_file2.txt new file mode 100644 index 000000000..c1a7bd5f1 --- /dev/null +++ b/ui_tests/test_files/test_supporting_file2.txt @@ -0,0 +1 @@ +blah blah blah diff --git a/ui_tests/test_files/test_valid_file_upload.txt b/ui_tests/test_files/test_valid_file_upload.txt index 40599af91..760733771 100644 --- a/ui_tests/test_files/test_valid_file_upload.txt +++ b/ui_tests/test_files/test_valid_file_upload.txt @@ -1,4 +1,4 @@ Project Entity ID,Accident type,Accident Date 3d3bc539-9aec-45e0-96a3-4e851068d5e2,motor vehicle,2/26/2018 2fc94c19-78d8-42a4-8e1a-0d8103340c72,recreational sport,3/15/2018 -a4832b32-25ac-41fc-96ca-7be5753b98b8,motor vehicle,4/22/2018 +a4832b32-25ac-41fd-96ca-7be5753b98b8,motor vehicle,4/22/2018 From e5928fed4630a4d55c91a5d3a4fd97c45264dc78 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 7 Jan 2019 16:55:05 -0800 Subject: [PATCH 174/226] added wait for btn to be clickable for "save and close" btn --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 96f9b9e25..c0f18b1bc 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -272,7 +272,9 @@ class Requester_step_def_ks { @When("the requester saves their request") def requester_saves_new_request() { - WebUI.click(get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID)) + TestObject saveCloseBtn = get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID) + WebUI.waitForElementClickable(saveCloseBtn, 30) + WebUI.click(saveCloseBtn) } @When("requester submits their request") From 6fc91a08b5d41753012faf93cec29c8560e7b6f4 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 8 Jan 2019 15:26:20 -0800 Subject: [PATCH 175/226] added prints to console to assist with troubleshooting; added test files --- .../groovy/Requester_step_def_ks.groovy | 30 ++++++++++++------ ui_tests/Profiles/default.glbl | 5 +++ .../test_blocked_max_file_size_limit.txt | Bin 12 -> 5500000 bytes .../test_files/test_valid_file_upload.txt | Bin 234 -> 3000000 bytes .../test_files/test_valid_file_upload2.txt | Bin 233 -> 3000000 bytes .../test_files/test_valid_file_upload3.txt | Bin 0 -> 3000000 bytes .../test_warning_max_file_size_limit.txt | Bin 12 -> 4500000 bytes 7 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 ui_tests/test_files/test_valid_file_upload3.txt diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index c0f18b1bc..e5317c68a 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -173,7 +173,7 @@ class Requester_step_def_ks { break case "the summation of all output file sizes exceeds the request file size warning threshold": //need to add output files that pass the warning limit individually but together surpass the combined size threshold - //requester_adds_output_file(GlobalVariable.WarningMaxSizeLimitFileName) + requester_uploads_files(GlobalVariable.ValidFileName, GlobalVariable.ValidFileName2, GlobalVariable.ValidFileName3) break default: throw new Exception("warning rule $warningRule not found") @@ -192,7 +192,7 @@ class Requester_step_def_ks { break case "the summation of all output file sizes exceeds the request file size limit": //need to add output files that pass the blocked limit individually but together surpass the combined size threshold - //requester_adds_output_file(GlobalVariable.BlockedMaxSizeLimitFileName) + requester_uploads_files(GlobalVariable.ValidFileName, GlobalVariable.ValidFileName2, GlobalVariable.WarningMaxSizeLimitFileName) break default: throw new Exception("block rule $blockingRule not found") @@ -263,18 +263,20 @@ class Requester_step_def_ks { requester_has_a_request_of_status("draft") WebUI.navigateToUrl("$GlobalVariable.OCWA_URL$LOGOUT_URL") } - + @Given("requester's project allows for editing of team member's requests") def project_allows_for_team_sharing(){} - + @Given("requester's project does not allow for editing of team member's requests") def project_does_not_allow_for_team_sharing(){} @When("the requester saves their request") def requester_saves_new_request() { + //WebUI.delay(2) TestObject saveCloseBtn = get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID) WebUI.waitForElementClickable(saveCloseBtn, 30) WebUI.click(saveCloseBtn) + WebUI.delay(3) } @When("requester submits their request") @@ -299,7 +301,9 @@ class Requester_step_def_ks { WebUI.navigateToUrl(GlobalVariable.OCWA_URL) WebUI.waitForPageLoad(20) WebUI.delay(2) - WebUI.click(get_test_object_by_text(g_requestName)) + TestObject linkToRequest = get_test_object_by_text(g_requestName) + WebUI.waitForElementClickable(linkToRequest, 20) + WebUI.click(linkToRequest) } @When("the requester cancels the request") @@ -340,10 +344,16 @@ class Requester_step_def_ks { @Then("the requester should see their saved request including (.+) output file (.+) supporting file") def confirm_draft_save_was_successful(String numOutputFiles, String numSupportingFiles){ - requester_views_request_they_created() + //requester_views_request_they_created() + WebUI.comment("current page (should be main page):${WebUI.getUrl()}l") + TestObject linkToRequest = get_test_object_by_text(g_requestName) + WebUI.waitForElementClickable(linkToRequest, 20) + WebUI.click(linkToRequest) + WebUI.waitForPageLoad(20) - WebUI.delay(5) + //WebUI.delay(5) + WebUI.comment("current page (should be request page):${WebUI.getUrl()}") WebUI.verifyTextPresent(g_requestName, false) if (numOutputFiles == "1") { @@ -376,6 +386,7 @@ class Requester_step_def_ks { @Then("the requester should see the complete record of the request including export files, supporting files/text, discussion, and status changes") def submitted_request_info_matches_what_was_submitted(){ + WebUI.comment("current page (should be request page):${WebUI.getUrl()}") WebUI.verifyTextPresent(GlobalVariable.ValidFileName, false) WebUI.verifyTextPresent(g_requestName, false) WebUI.verifyTextPresent(PURPOSE_TEXT, false) @@ -408,7 +419,8 @@ class Requester_step_def_ks { @Then("requester should be able to make changes to the request") def requester_should_be_able_to_make_changes_to_the_request(){ - requester_views_request_they_created() + //requester_views_request_they_created() + WebUI.comment("current page (should be request page):${WebUI.getUrl()}") WebUI.click(get_test_object_by_id(REQUEST_EDIT_BTN_ID)) WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), EDITED_PURPOSE_TEXT) } @@ -435,7 +447,7 @@ class Requester_step_def_ks { def team_members_request_should_be_editable() { requester_should_be_able_to_make_changes_to_the_request() } - + @Then("the team member's request should not be visible") def team_members_request_should_not_be_visible(){ WebUI.verifyTextNotPresent(g_requestName, false) diff --git a/ui_tests/Profiles/default.glbl b/ui_tests/Profiles/default.glbl index ce8e5aa47..07eb8a3b5 100644 --- a/ui_tests/Profiles/default.glbl +++ b/ui_tests/Profiles/default.glbl @@ -84,4 +84,9 @@ 'team_member_1_password' OCWA_USER_TEAM_MEMBER_PSWD + + + 'test_valid_file_upload3.txt' + ValidFileName3 + diff --git a/ui_tests/test_files/test_blocked_max_file_size_limit.txt b/ui_tests/test_files/test_blocked_max_file_size_limit.txt index 9132c66b789e7231bbea44d5126ed288a9d6d41c..6db5471610cae3688350caea63a451a32321ce49 100644 GIT binary patch literal 5500000 zcmeFtfdBvi0Dz$VsTV1P3IhfV7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjxE(r>0RR91802q#kFO9i zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ u0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjI1U8yJpcg! literal 12 NcmYc+PDx9IVgMhN1ls@r diff --git a/ui_tests/test_files/test_valid_file_upload.txt b/ui_tests/test_files/test_valid_file_upload.txt index 7607337718737778f6a6f8736452c5542422d3e8..73e77f405a9ff5ab6f54695cf10e7be6d23c9a4b 100644 GIT binary patch literal 3000000 zcmeIufdBvi0K=g9Qy=7oP+`D;0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKz{|h@$zuQk literal 234 zcmZ9`F>b>!429u6r_cdRSRy5x8VjUDw_Jgu7}P~-1*%XWx37Z^1vvxbe8#-#W{%6ICjjC_@%gh{-(UMF^sC3Vz|545!aFT6f>}zUj>- zoN<}a2R`9dbJUPw<;oCIBCrJkUpaW9=yk=Zn|712wOwxR>)!g9Xb$POAdv|RAz+e& Y57&C|DzFwyYoe05@IOAzcszLWKYB4k{{R30 diff --git a/ui_tests/test_files/test_valid_file_upload2.txt b/ui_tests/test_files/test_valid_file_upload2.txt index 3925123543d69d2cad6951d569d17a6ca7db9252..73e77f405a9ff5ab6f54695cf10e7be6d23c9a4b 100644 GIT binary patch literal 3000000 zcmeIufdBvi0K=g9Qy=7oP+`D;0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKz{|h@$zuQk literal 233 zcmZ9`F^&Q;429vIQ{(`#Cb5&5q(ov1y1jzq7%?k$g0c}3x8IQ{kSJgCfA71uAC+Og zwy}<*k@?Rc>l= z!g)gH^8qiCgZKw61dP1% Y{vtas3`^0tL@GIz^udP-_Xj)w4>ra__W%F@ diff --git a/ui_tests/test_files/test_valid_file_upload3.txt b/ui_tests/test_files/test_valid_file_upload3.txt new file mode 100644 index 0000000000000000000000000000000000000000..73e77f405a9ff5ab6f54695cf10e7be6d23c9a4b GIT binary patch literal 3000000 zcmeIufdBvi0K=g9Qy=7oP+`D;0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKz{|h@$zuQk literal 0 HcmV?d00001 diff --git a/ui_tests/test_files/test_warning_max_file_size_limit.txt b/ui_tests/test_files/test_warning_max_file_size_limit.txt index 9132c66b789e7231bbea44d5126ed288a9d6d41c..1c4bdf570aeec902d9195d420ea9730e2c11bb46 100644 GIT binary patch literal 4500000 zcmeFtfdBvi0Dz$VsTV1P3IhfV7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjxE(r>0RR91802q#kFO9i zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DQZ^FXc~ B00961 literal 12 NcmYc+PDx9IVgMhN1ls@r From 129e85f5844fdcb24c58620917a124578a41af4e Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 8 Jan 2019 16:37:38 -0800 Subject: [PATCH 176/226] added more prints to console to better describe what tests are doing --- .../groovy/Requester_step_def_ks.groovy | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index e5317c68a..1db54165f 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -64,6 +64,7 @@ class Requester_step_def_ks { String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" String LOGOUT_URL = "/auth/logout" + String NEW_REQUEST_DIALOG_HEADER_TEXT = "Initiate a New Request" String g_requestName = "" @@ -345,11 +346,14 @@ class Requester_step_def_ks { @Then("the requester should see their saved request including (.+) output file (.+) supporting file") def confirm_draft_save_was_successful(String numOutputFiles, String numSupportingFiles){ //requester_views_request_they_created() - WebUI.comment("current page (should be main page):${WebUI.getUrl()}l") + WebUI.comment("current page (should be main page):${WebUI.getUrl()}") + if (is_new_request_dialog_window_open()) { WebUI.comment("the new request dialog is still open (and it shouldn't be at this point)") } TestObject linkToRequest = get_test_object_by_text(g_requestName) WebUI.waitForElementClickable(linkToRequest, 20) + //WebUI.comment("request link url:${linkToRequest.findPropertyValue("href")}") WebUI.click(linkToRequest) - + WebUI.comment("clicked on the request link that contains text: $g_requestName") + WebUI.waitForPageLoad(20) //WebUI.delay(5) @@ -466,5 +470,16 @@ class Requester_step_def_ks { tObject.addProperty("text", ConditionType.EQUALS, t, true) return tObject } + //Helper function to determine if dialog window is open + def is_new_request_dialog_window_open() { + try { + WebUI.verifyTextPresent(NEW_REQUEST_DIALOG_HEADER_TEXT, false) + return true + } + catch(Exception e) { + return false + } + } + } \ No newline at end of file From 1cf3feb740151df40fd77ac9351a80e5330b0b5a Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 10 Jan 2019 10:50:56 -0800 Subject: [PATCH 177/226] split out the blocked/warning file upload tests into separate features --- .../requester/create_a_new_request.feature | 27 +------------- .../see_blocked_file_uploads.feature | 19 ++++++++++ .../see_warning_file_uploads.feature | 18 ++++++++++ .../groovy/Requester_step_def_ks.groovy | 36 ++++++++++++++----- 4 files changed, 65 insertions(+), 35 deletions(-) create mode 100644 ui_tests/Include/features/requester/see_blocked_file_uploads.feature create mode 100644 ui_tests/Include/features/requester/see_warning_file_uploads.feature diff --git a/ui_tests/Include/features/requester/create_a_new_request.feature b/ui_tests/Include/features/requester/create_a_new_request.feature index f639f2555..422746aa6 100644 --- a/ui_tests/Include/features/requester/create_a_new_request.feature +++ b/ui_tests/Include/features/requester/create_a_new_request.feature @@ -9,29 +9,4 @@ Feature: create a new request When requester submits their request Then the request status is changed to "Awaiting review" Scenario: A request has no data - Then the requester should not be able to submit the request - - Scenario Outline: A request violates blocking rule - Given request violates given blocking rule - When requester submits their request - Then the requester should not be able to submit the request - And requester should be informed that given blocking rule has been violated - - Examples: - | blocking_rule | - | A request that has a file that is too big | - | The summation of all output file sizes exceeds the request file size limit | - | An output file has a blocked file extension | - | A request has a file with a StudyID in it | - - Scenario Outline: A request violates warning rule - Given request violates given warning rule - When requester submits their request - Then the requester should be able to submit the request - And requester should be informed that given warning rule has been violated - - Examples: - | warning_rule | - | A request that has a file that exceeds the file size warning threshold | - | The summation of all output file sizes exceeds the request file size warning threshold | - | An output file has a warning file extension | \ No newline at end of file + Then the requester should not be able to submit the request \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_blocked_file_uploads.feature b/ui_tests/Include/features/requester/see_blocked_file_uploads.feature new file mode 100644 index 000000000..728ddedbf --- /dev/null +++ b/ui_tests/Include/features/requester/see_blocked_file_uploads.feature @@ -0,0 +1,19 @@ +Feature: see blocked file uploads + As an requester I want to be able to see blocked file uploads so that I can adjust my uploads to be compliant with what can be taken out of the secure environment + Background: + Given requester has logged in + And requester has started a request + And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge + Scenario Outline: A request violates blocking rule + Given request violates given blocking rule + When requester submits their request + Then the requester should not be able to submit the request + And requester should be informed that given blocking rule has been violated + + Examples: + | blocking_rule | + | A request that has a file that is too big | + | The summation of all output file sizes exceeds the request file size limit | + | An output file has a blocked file extension | + | A request has a file with a StudyID in it | + \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_warning_file_uploads.feature b/ui_tests/Include/features/requester/see_warning_file_uploads.feature new file mode 100644 index 000000000..919aa8689 --- /dev/null +++ b/ui_tests/Include/features/requester/see_warning_file_uploads.feature @@ -0,0 +1,18 @@ +Feature: see blocked file uploads + As an requester I want to be able to see file uploads with warnings so that I can adjust my uploads to be compliant with what can be taken out of the secure environment + Background: + Given requester has logged in + And requester has started a request + And the requester affirms the output is safe for release and protects the confidentiality of data, to the best of their knowledge + Scenario Outline: A request violates warning rule + Given request violates given warning rule + When requester submits their request + Then the requester should be able to submit the request + And requester should be informed that given warning rule has been violated + + Examples: + | warning_rule | + | A request that has a file that exceeds the file size warning threshold | + | The summation of all output file sizes exceeds the request file size warning threshold | + | An output file has a warning file extension | + \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 1db54165f..fc103a47d 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -103,6 +103,8 @@ class Requester_step_def_ks { WebUI.waitForPageLoad(30) WebUI.delay(5) + WebUI.switchToDefaultContent() + WebUI.waitForElementVisible(newRequestButtonObject, 20) WebUI.waitForElementClickable(newRequestButtonObject, 30) WebUI.click(newRequestButtonObject) WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), PURPOSE_TEXT) @@ -275,8 +277,11 @@ class Requester_step_def_ks { def requester_saves_new_request() { //WebUI.delay(2) TestObject saveCloseBtn = get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID) - WebUI.waitForElementClickable(saveCloseBtn, 30) + if (!WebUI.waitForElementClickable(saveCloseBtn, 30)) { + WebUI.comment("waiting for Save and Close button to be clickable timed out") + } WebUI.click(saveCloseBtn) + WebUI.waitForElementNotVisible(get_test_object_by_text(NEW_REQUEST_DIALOG_HEADER_TEXT), 20) WebUI.delay(3) } @@ -303,7 +308,13 @@ class Requester_step_def_ks { WebUI.waitForPageLoad(20) WebUI.delay(2) TestObject linkToRequest = get_test_object_by_text(g_requestName) - WebUI.waitForElementClickable(linkToRequest, 20) + WebUI.waitForElementVisible(linkToRequest, 20) + if (!WebUI.verifyTextPresent(linkToRequest)) { + WebUI.comment("request text:$g_requestName not found") + } + if (!WebUI.waitForElementClickable(linkToRequest, 20)) { + WebUI.comment("waiting for request link to be clickable timed out") + } WebUI.click(linkToRequest) } @@ -348,13 +359,16 @@ class Requester_step_def_ks { //requester_views_request_they_created() WebUI.comment("current page (should be main page):${WebUI.getUrl()}") if (is_new_request_dialog_window_open()) { WebUI.comment("the new request dialog is still open (and it shouldn't be at this point)") } + if (!WebUI.verifyTextPresent(g_requestName, false)) { + WebUI.comment("unable to find the text:$g_requestName on the page. This text is used to find the request link") + } TestObject linkToRequest = get_test_object_by_text(g_requestName) - WebUI.waitForElementClickable(linkToRequest, 20) - //WebUI.comment("request link url:${linkToRequest.findPropertyValue("href")}") + if (!WebUI.waitForElementClickable(linkToRequest, 20)) { + WebUI.comment("waiting for the link to the request to be clickable on the main page timed out") + } WebUI.click(linkToRequest) WebUI.comment("clicked on the request link that contains text: $g_requestName") - WebUI.waitForPageLoad(20) //WebUI.delay(5) WebUI.comment("current page (should be request page):${WebUI.getUrl()}") @@ -378,6 +392,10 @@ class Requester_step_def_ks { @Then("the requester should not be able to submit the request") def requester_is_not_able_to_submit_request(){ + TestObject requestFormSaveFilesButton = get_test_object_by_id(REQUEST_SAVE_FILES_BTN_ID) + WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) + WebUI.click(requestFormSaveFilesButton) + WebUI.delay(2) WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) WebUI.closeBrowser() } @@ -397,7 +415,7 @@ class Requester_step_def_ks { WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) WebUI.delay(2) requester_should_see_their_new_comment_displayed() - WebUI.delay(5) + //WebUI.delay(5) WebUI.closeBrowser() } @@ -473,11 +491,11 @@ class Requester_step_def_ks { //Helper function to determine if dialog window is open def is_new_request_dialog_window_open() { try { - WebUI.verifyTextPresent(NEW_REQUEST_DIALOG_HEADER_TEXT, false) + WebUI.verifyTextPresent(NEW_REQUEST_DIALOG_HEADER_TEXT, false, FailureHandling.OPTIONAL) return true } - catch(Exception e) { - return false + catch(Exception e) { + return false } } From b5d420367d534e0f800432d563b22fae127ec66c Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 10 Jan 2019 15:58:49 -0800 Subject: [PATCH 178/226] refined test case features; created "import into SRE" test case features --- .../features/import/import_files_blocked.feature | 14 ++++++++++++++ .../import_files_into_research_environment.feature | 10 ++++++++++ .../import/import_files_with_warnings.feature | 14 ++++++++++++++ ..._see_edit_project_team_members_requests.feature | 9 +++++++++ .../see_edit_project_team_members_requests.feature | 12 ++++-------- 5 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 ui_tests/Include/features/import/import_files_blocked.feature create mode 100644 ui_tests/Include/features/import/import_files_into_research_environment.feature create mode 100644 ui_tests/Include/features/import/import_files_with_warnings.feature create mode 100644 ui_tests/Include/features/requester/prevent_see_edit_project_team_members_requests.feature diff --git a/ui_tests/Include/features/import/import_files_blocked.feature b/ui_tests/Include/features/import/import_files_blocked.feature new file mode 100644 index 000000000..3230e7a6c --- /dev/null +++ b/ui_tests/Include/features/import/import_files_blocked.feature @@ -0,0 +1,14 @@ +Feature: Import files into research environment +As an importer I want to be able to see if files I upload are blocked so that I can be aware of problematic files +Scenario Outline: Importer imports a file that triggers blocking + Given importer has logged in + And importer uploads a file that triggers a blocking + When importer submits their import request + Then importer should see a blocking message + And importer should not be able to access their imported file from within the research environment + + Examples: + | blocking_rule | + | A request that has a file that is too big | + | The summation of all output file sizes exceeds the request file size limit | + | An output file has a blocked file extension | \ No newline at end of file diff --git a/ui_tests/Include/features/import/import_files_into_research_environment.feature b/ui_tests/Include/features/import/import_files_into_research_environment.feature new file mode 100644 index 000000000..ce2059dff --- /dev/null +++ b/ui_tests/Include/features/import/import_files_into_research_environment.feature @@ -0,0 +1,10 @@ +Feature: Import files into research environment +As an importer I want to be able to bring files into the research environment so that I can use the imported files to help with my research + Scenario: Importer imports a valid file + Given importer has logged in + And importer uploads a file that does not trigger any warnings or blocking + When importer submits their import request + Then importer should see that their request has been succesfully imported + And importer should be able to access their imported file from within the research environment + + \ No newline at end of file diff --git a/ui_tests/Include/features/import/import_files_with_warnings.feature b/ui_tests/Include/features/import/import_files_with_warnings.feature new file mode 100644 index 000000000..7981b7ef3 --- /dev/null +++ b/ui_tests/Include/features/import/import_files_with_warnings.feature @@ -0,0 +1,14 @@ +Feature: Import files into research environment +As an importer I want to be able to see warnings related to files that I bring into the research environment so that I can be aware of files that may be an issue +Scenario Outline: Importer imports a file that triggers warnings + Given importer has logged in + And importer uploads a file that triggers a warning + When importer submits their import request + Then importer should see a warning message + And importer should be able to access their imported file from within the research environment + + Examples: + | warning_rule | + | A request that has a file that exceeds the file size warning threshold | + | The summation of all output file sizes exceeds the request file size warning threshold | + | An output file has a warning file extension | \ No newline at end of file diff --git a/ui_tests/Include/features/requester/prevent_see_edit_project_team_members_requests.feature b/ui_tests/Include/features/requester/prevent_see_edit_project_team_members_requests.feature new file mode 100644 index 000000000..edbb03a89 --- /dev/null +++ b/ui_tests/Include/features/requester/prevent_see_edit_project_team_members_requests.feature @@ -0,0 +1,9 @@ +#This feature is contingent on a project being configured to disallow team sharing +Feature: prevent seeing / editing project team members requests +As an requester I need the ability to have my requests hidden from my other team members so that keep my files private until I am ready to share + Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests + Given a project team member has created a request + And requester has logged in + And requester's project does not allow for editing of team member's requests + When requester views their requests + Then the team member's request should not be visible \ No newline at end of file diff --git a/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature b/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature index e3e3e8f8b..9cd0b040d 100644 --- a/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature +++ b/ui_tests/Include/features/requester/see_edit_project_team_members_requests.feature @@ -1,13 +1,9 @@ +#This feature is contingent on a project being configured to allow team sharing Feature: seeing / editing project team members requests As an requester I need the ability to see / edit my team member's requests so that I can more easily collaborate with my fellow team members - Background: + Scenario: View / edit a team member's request in a project that allows editing of team member's requests Given a project team member has created a request And requester has logged in - Scenario: View / edit a team member's request in a project that allows editing of team member's requests - Given requester's project allows for editing of team member's requests - When requester views their requests - Then the team member's request should be visible and editable - Scenario: View / edit a team member's request in a project that does not allow editing of team member's requests - Given requester's project does not allow for editing of team member's requests + And requester's project allows for editing of team member's requests When requester views their requests - Then the team member's request should not be visible \ No newline at end of file + Then the team member's request should be visible and editable \ No newline at end of file From 02c32b35926ecacf53d63cd3297f729ca711bb82 Mon Sep 17 00:00:00 2001 From: PaulR Date: Thu, 10 Jan 2019 16:38:35 -0800 Subject: [PATCH 179/226] add more time before clicking the save and close button --- .../features/requester/notifications.feature | 7 +++---- .../groovy/Requester_step_def_ks.groovy | 19 ++++++------------- ui_tests/Profiles/default.glbl | 4 ++-- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/ui_tests/Include/features/requester/notifications.feature b/ui_tests/Include/features/requester/notifications.feature index 375deef8f..5fa04b8c0 100644 --- a/ui_tests/Include/features/requester/notifications.feature +++ b/ui_tests/Include/features/requester/notifications.feature @@ -1,11 +1,11 @@ +# Notifications have two parts the notices under the "bell" icon and emails. It's hard to automate testing whether people receive emails so the focus will be on "bell" notices Feature: Notifications As an requester / output checker I want to be notified when events related to my requests occur so that I know I need to take action Scenario Outline: requester notifications Given requester has submitted a request When occurs - Then the requester should receive an email notifying them of the - But the email should not contain specifics of the request + Then the requester see a notification notifying them of the Examples: | event | | output checker makes a comment on the request | @@ -15,8 +15,7 @@ As an requester / output checker I want to be notified when events related to my Scenario Outline: output checker notifications Given an output checker has currently claimed a request When occurs - Then the output checker should receive an email notifying them of the - But the email should not contain specifics of the request + Then the output checker should see a notification notifying them of the Examples: | event | | requester makes a comment on the request | diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index fc103a47d..5941a1043 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -130,14 +130,17 @@ class Requester_step_def_ks { //Upload files TestObject uploadFileButton = get_test_object_by_id(REQUEST_FILES_UPLOAD_BTN_ID) + WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$fileToUpload") WebUI.delay(5) if (secondFile != "") { + WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$secondFile") WebUI.delay(5) } if (thirdFile != "") { + WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$thirdFile") WebUI.delay(5) } @@ -275,7 +278,7 @@ class Requester_step_def_ks { @When("the requester saves their request") def requester_saves_new_request() { - //WebUI.delay(2) + WebUI.delay(5) TestObject saveCloseBtn = get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID) if (!WebUI.waitForElementClickable(saveCloseBtn, 30)) { WebUI.comment("waiting for Save and Close button to be clickable timed out") @@ -358,7 +361,7 @@ class Requester_step_def_ks { def confirm_draft_save_was_successful(String numOutputFiles, String numSupportingFiles){ //requester_views_request_they_created() WebUI.comment("current page (should be main page):${WebUI.getUrl()}") - if (is_new_request_dialog_window_open()) { WebUI.comment("the new request dialog is still open (and it shouldn't be at this point)") } + if (!WebUI.verifyTextNotPresent(NEW_REQUEST_DIALOG_HEADER_TEXT, false, FailureHandling.OPTIONAL)) { WebUI.comment("the new request dialog is still open (and it shouldn't be at this point)") } if (!WebUI.verifyTextPresent(g_requestName, false)) { WebUI.comment("unable to find the text:$g_requestName on the page. This text is used to find the request link") } @@ -488,16 +491,6 @@ class Requester_step_def_ks { tObject.addProperty("text", ConditionType.EQUALS, t, true) return tObject } - //Helper function to determine if dialog window is open - def is_new_request_dialog_window_open() { - try { - WebUI.verifyTextPresent(NEW_REQUEST_DIALOG_HEADER_TEXT, false, FailureHandling.OPTIONAL) - return true - } - catch(Exception e) { - return false - } - } - + } \ No newline at end of file diff --git a/ui_tests/Profiles/default.glbl b/ui_tests/Profiles/default.glbl index 07eb8a3b5..4ad772504 100644 --- a/ui_tests/Profiles/default.glbl +++ b/ui_tests/Profiles/default.glbl @@ -76,12 +76,12 @@ - 'team_member_1' + 'groucho' OCWA_USER_TEAM_MEMBER - 'team_member_1_password' + 'groucho1234' OCWA_USER_TEAM_MEMBER_PSWD From 4c88158309491a04b195f574873ac35f5758a78d Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 11 Jan 2019 16:34:36 -0800 Subject: [PATCH 180/226] added better wait checks for disabled buttons --- .../groovy/Requester_step_def_ks.groovy | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 5941a1043..ef1b16489 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -104,6 +104,8 @@ class Requester_step_def_ks { WebUI.delay(5) WebUI.switchToDefaultContent() + WebUI.waitForElementNotHasAttribute(newRequestButtonObject, "disabled", 10) + WebUI.waitForElementVisible(newRequestButtonObject, 20) WebUI.waitForElementClickable(newRequestButtonObject, 30) WebUI.click(newRequestButtonObject) @@ -130,19 +132,22 @@ class Requester_step_def_ks { //Upload files TestObject uploadFileButton = get_test_object_by_id(REQUEST_FILES_UPLOAD_BTN_ID) + WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$fileToUpload") - WebUI.delay(5) + //WebUI.delay(5) if (secondFile != "") { + WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$secondFile") - WebUI.delay(5) + //WebUI.delay(5) } if (thirdFile != "") { + WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$thirdFile") - WebUI.delay(5) + //WebUI.delay(5) } } @@ -278,8 +283,9 @@ class Requester_step_def_ks { @When("the requester saves their request") def requester_saves_new_request() { - WebUI.delay(5) + //WebUI.delay(5) TestObject saveCloseBtn = get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID) + WebUI.waitForElementNotHasAttribute(saveCloseBtn, "disabled", 10) if (!WebUI.waitForElementClickable(saveCloseBtn, 30)) { WebUI.comment("waiting for Save and Close button to be clickable timed out") } @@ -290,8 +296,12 @@ class Requester_step_def_ks { @When("requester submits their request") def requester_submits_request() { - WebUI.click(get_test_object_by_id(REQUEST_SAVE_BTN_ID)) - WebUI.delay(15) + TestObject saveBtn = get_test_object_by_id(REQUEST_SAVE_BTN_ID) + WebUI.waitForElementNotHasAttribute(saveBtn, "disabled", 10) + WebUI.waitForElementClickable(saveBtn, 30) + WebUI.click(saveBtn) + //WebUI.delay(15) + WebUI.waitForElementNotHasAttribute(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), "disabled", 10) WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) WebUI.delay(3) @@ -312,13 +322,14 @@ class Requester_step_def_ks { WebUI.delay(2) TestObject linkToRequest = get_test_object_by_text(g_requestName) WebUI.waitForElementVisible(linkToRequest, 20) - if (!WebUI.verifyTextPresent(linkToRequest)) { + if (!WebUI.verifyTextPresent(g_requestName, false)) { WebUI.comment("request text:$g_requestName not found") } if (!WebUI.waitForElementClickable(linkToRequest, 20)) { WebUI.comment("waiting for request link to be clickable timed out") } WebUI.click(linkToRequest) + WebUI.waitForPageLoad(20) } @When("the requester cancels the request") @@ -366,6 +377,7 @@ class Requester_step_def_ks { WebUI.comment("unable to find the text:$g_requestName on the page. This text is used to find the request link") } TestObject linkToRequest = get_test_object_by_text(g_requestName) + WebUI.waitForElementNotHasAttribute(linkToRequest, "disabled", 10) if (!WebUI.waitForElementClickable(linkToRequest, 20)) { WebUI.comment("waiting for the link to the request to be clickable on the main page timed out") } @@ -399,13 +411,16 @@ class Requester_step_def_ks { WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) WebUI.delay(2) - WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + //WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + WebUI.verifyElementNotHasAttribute(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), "disabled", 10) + WebUI.closeBrowser() } @Then("the requester should be able to submit the request") def requester_is_able_to_submit_request(){ - WebUI.verifyElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + WebUI.verifyElementHasAttribute(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'),"disabled", 10) + //WebUI.verifyElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) WebUI.closeBrowser() } @@ -423,8 +438,9 @@ class Requester_step_def_ks { } @Then('the request status is changed to "(.+)"') - def request_should_be_in_given_status(String status){ - WebUI.verifyTextPresent(status, false) + def request_should_be_in_given_status(String statusTxt){ + requester_views_request_they_created() + WebUI.verifyTextPresent(statusTxt, false) WebUI.closeBrowser() } @@ -491,6 +507,6 @@ class Requester_step_def_ks { tObject.addProperty("text", ConditionType.EQUALS, t, true) return tObject } - + } \ No newline at end of file From 6056eb10aa51c3ab90c3b2ae247ca6e2464c12ef Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 18 Jan 2019 11:14:52 -0800 Subject: [PATCH 181/226] removed hard delays in favour of more "wait" functions --- .../requester/create_a_new_request.feature | 2 +- .../groovy/Requester_step_def_ks.groovy | 51 +++++++----------- .../span_Submit for Review.rs | 16 ++++-- ui_tests/test_files/test_supporting_file.txt | 2 +- .../test_files/test_valid_file_upload.txt | Bin 3000000 -> 3000001 bytes 5 files changed, 35 insertions(+), 36 deletions(-) diff --git a/ui_tests/Include/features/requester/create_a_new_request.feature b/ui_tests/Include/features/requester/create_a_new_request.feature index 422746aa6..a87707a79 100644 --- a/ui_tests/Include/features/requester/create_a_new_request.feature +++ b/ui_tests/Include/features/requester/create_a_new_request.feature @@ -7,6 +7,6 @@ Feature: create a new request Scenario: A valid request Given requester adds an output file that does not violate any blocking or warning rules When requester submits their request - Then the request status is changed to "Awaiting review" + Then the request status is changed to "Awaiting Review" Scenario: A request has no data Then the requester should not be able to submit the request \ No newline at end of file diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index ef1b16489..534dc99c8 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -64,7 +64,8 @@ class Requester_step_def_ks { String REQUEST_WITHDRAW_BTN_ID = "request-sidebar-withdraw-button" String REQUEST_CANCEL_BTN_ID = "request-sidebar-cancel-button" String LOGOUT_URL = "/auth/logout" - String NEW_REQUEST_DIALOG_HEADER_TEXT = "Initiate a New Request" + //String NEW_REQUEST_DIALOG_HEADER_TEXT = "Initiate a New Request" + String NEW_REQUEST_DIALOG_ID = "request-form" String g_requestName = "" @@ -79,10 +80,7 @@ class Requester_step_def_ks { def login(String username, String password){ WebUI.openBrowser('') - WebUI.delay(5) - WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - //WebUI.navigateToUrl("http://localhost:8000") TestObject loginButton = get_test_object_by_id(LOGIN_BTN_ID) WebUI.waitForElementClickable(loginButton, 30) WebUI.click(loginButton) @@ -101,9 +99,6 @@ class Requester_step_def_ks { TestObject newRequestButtonObject = get_test_object_by_id(NEW_REQUEST_BTN_ID) WebUI.waitForPageLoad(30) - WebUI.delay(5) - - WebUI.switchToDefaultContent() WebUI.waitForElementNotHasAttribute(newRequestButtonObject, "disabled", 10) WebUI.waitForElementVisible(newRequestButtonObject, 20) @@ -112,9 +107,6 @@ class Requester_step_def_ks { WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), PURPOSE_TEXT) g_requestName = CustomKeywords.'test_OCWA_keywords.random_test_request_name.gen_random_test_request_name'() WebUI.setText(findTestObject('Object Repository/Page_OCWA Development Version/input_Request Name_name'), g_requestName) - - - WebUI.delay(2) } @Given("has not submitted the request") @@ -135,19 +127,16 @@ class Requester_step_def_ks { WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$fileToUpload") - //WebUI.delay(5) if (secondFile != "") { WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$secondFile") - //WebUI.delay(5) } if (thirdFile != "") { WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$thirdFile") - //WebUI.delay(5) } } @@ -283,15 +272,16 @@ class Requester_step_def_ks { @When("the requester saves their request") def requester_saves_new_request() { - //WebUI.delay(5) + TestObject saveCloseBtn = get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID) WebUI.waitForElementNotHasAttribute(saveCloseBtn, "disabled", 10) + WebUI.waitForElementVisible(saveCloseBtn, 10) if (!WebUI.waitForElementClickable(saveCloseBtn, 30)) { WebUI.comment("waiting for Save and Close button to be clickable timed out") } WebUI.click(saveCloseBtn) - WebUI.waitForElementNotVisible(get_test_object_by_text(NEW_REQUEST_DIALOG_HEADER_TEXT), 20) - WebUI.delay(3) + + WebUI.waitForElementNotPresent(saveCloseBtn, 10) //wait for the modal window to close } @When("requester submits their request") @@ -300,11 +290,11 @@ class Requester_step_def_ks { WebUI.waitForElementNotHasAttribute(saveBtn, "disabled", 10) WebUI.waitForElementClickable(saveBtn, 30) WebUI.click(saveBtn) - //WebUI.delay(15) WebUI.waitForElementNotHasAttribute(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), "disabled", 10) WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) - WebUI.delay(3) + + WebUI.waitForElementNotPresent(saveBtn, 10) //wait for the modal window to close } @When("requester writes and submits a new comment") @@ -317,14 +307,13 @@ class Requester_step_def_ks { @When("the requester views the request") def requester_views_request_they_created(){ - WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - WebUI.waitForPageLoad(20) - WebUI.delay(2) + if (WebUI.getUrl() != GlobalVariable.OCWA_URL) { + WebUI.navigateToUrl(GlobalVariable.OCWA_URL) + WebUI.waitForPageLoad(20) + } TestObject linkToRequest = get_test_object_by_text(g_requestName) WebUI.waitForElementVisible(linkToRequest, 20) - if (!WebUI.verifyTextPresent(g_requestName, false)) { - WebUI.comment("request text:$g_requestName not found") - } + if (!WebUI.waitForElementClickable(linkToRequest, 20)) { WebUI.comment("waiting for request link to be clickable timed out") } @@ -372,7 +361,8 @@ class Requester_step_def_ks { def confirm_draft_save_was_successful(String numOutputFiles, String numSupportingFiles){ //requester_views_request_they_created() WebUI.comment("current page (should be main page):${WebUI.getUrl()}") - if (!WebUI.verifyTextNotPresent(NEW_REQUEST_DIALOG_HEADER_TEXT, false, FailureHandling.OPTIONAL)) { WebUI.comment("the new request dialog is still open (and it shouldn't be at this point)") } + //if (!WebUI.verifyTextNotPresent(NEW_REQUEST_DIALOG_HEADER_TEXT, false, FailureHandling.OPTIONAL)) { WebUI.comment("the new request dialog is still open (and it shouldn't be at this point)") } + //if (WebUI.verifyElementNotInViewport(get_test_object_by_id(NEW_REQUEST_DIALOG_ID), 1, FailureHandling.OPTIONAL)) if (!WebUI.verifyTextPresent(g_requestName, false)) { WebUI.comment("unable to find the text:$g_requestName on the page. This text is used to find the request link") } @@ -385,8 +375,8 @@ class Requester_step_def_ks { WebUI.comment("clicked on the request link that contains text: $g_requestName") WebUI.waitForPageLoad(20) - //WebUI.delay(5) WebUI.comment("current page (should be request page):${WebUI.getUrl()}") + WebUI.waitForAngularLoad(10) WebUI.verifyTextPresent(g_requestName, false) if (numOutputFiles == "1") { @@ -410,8 +400,7 @@ class Requester_step_def_ks { TestObject requestFormSaveFilesButton = get_test_object_by_id(REQUEST_SAVE_FILES_BTN_ID) WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) WebUI.click(requestFormSaveFilesButton) - WebUI.delay(2) - //WebUI.verifyElementNotClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) + WebUI.verifyElementNotHasAttribute(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), "disabled", 10) WebUI.closeBrowser() @@ -420,7 +409,6 @@ class Requester_step_def_ks { @Then("the requester should be able to submit the request") def requester_is_able_to_submit_request(){ WebUI.verifyElementHasAttribute(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'),"disabled", 10) - //WebUI.verifyElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), FailureHandling.STOP_ON_FAILURE) WebUI.closeBrowser() } @@ -431,7 +419,7 @@ class Requester_step_def_ks { WebUI.verifyTextPresent(g_requestName, false) WebUI.verifyTextPresent(PURPOSE_TEXT, false) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/a_Discussion')) - WebUI.delay(2) + //WebUI.delay(2) requester_should_see_their_new_comment_displayed() //WebUI.delay(5) WebUI.closeBrowser() @@ -440,6 +428,7 @@ class Requester_step_def_ks { @Then('the request status is changed to "(.+)"') def request_should_be_in_given_status(String statusTxt){ requester_views_request_they_created() + WebUI.comment("current page (should be request page):${WebUI.getUrl()}") WebUI.verifyTextPresent(statusTxt, false) WebUI.closeBrowser() } @@ -469,7 +458,7 @@ class Requester_step_def_ks { def requester_should_be_able_to_resubmit_request(){ WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) - WebUI.delay(5) + //WebUI.delay(5) request_should_be_in_given_status("Review in progress") WebUI.closeBrowser() } diff --git a/ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs b/ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs index f6d179138..15c05afc1 100644 --- a/ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs +++ b/ui_tests/Object Repository/Page_OCWA Development Version/span_Submit for Review.rs @@ -4,24 +4,34 @@ span_Submit for Review f241e897-ea5f-4f0b-a1e4-6f96813f8653 + + + XPATH + //button[@id='request-form-submit-button']/span/span + + + BASIC + id("request-form-submit-button")/span[1]/span[1] + + BASIC false - true + false equals tag Main span - true + false equals text Main Submit for Review - false + true equals xpath Main diff --git a/ui_tests/test_files/test_supporting_file.txt b/ui_tests/test_files/test_supporting_file.txt index a7f334593..26d247d58 100644 --- a/ui_tests/test_files/test_supporting_file.txt +++ b/ui_tests/test_files/test_supporting_file.txt @@ -1 +1 @@ -quack quack quack +quack quack quack quack diff --git a/ui_tests/test_files/test_valid_file_upload.txt b/ui_tests/test_files/test_valid_file_upload.txt index 73e77f405a9ff5ab6f54695cf10e7be6d23c9a4b..1935db7b0cabacfb74da531ec7f8aaf7fd32e7a9 100644 GIT binary patch literal 3000001 zcmeIufdBvi00JPD)%KSdYwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<`09fdK~4 BE;#@I literal 3000000 zcmeIufdBvi0K=g9Qy=7oP+`D;0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@ z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VK zfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5 zV8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKz{|h@$zuQk From 48cfcdd9bc3f5e7ef6691c62dbab76b8b8b63218 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 18 Jan 2019 13:21:46 -0800 Subject: [PATCH 182/226] added a delay between upload and save close btn click --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 534dc99c8..a1b6dbeef 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -127,6 +127,7 @@ class Requester_step_def_ks { WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) WebUI.waitForElementClickable(uploadFileButton, 30) WebUI.sendKeys(uploadFileButton, "$GlobalVariable.TestFilePath$fileToUpload") + WebUI.delay(10) if (secondFile != "") { WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) WebUI.waitForElementClickable(uploadFileButton, 30) From f0785cdf3182eee364c73836aba83c95e80bf82c Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 21 Jan 2019 10:33:08 -0800 Subject: [PATCH 183/226] tweaks to test script; switched test to test submitting a request --- .../Include/scripts/groovy/Requester_step_def_ks.groovy | 7 +++++-- .../Scripts/RunCucumberTests/Script1545256102660.groovy | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index a1b6dbeef..055f3edb8 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -291,8 +291,10 @@ class Requester_step_def_ks { WebUI.waitForElementNotHasAttribute(saveBtn, "disabled", 10) WebUI.waitForElementClickable(saveBtn, 30) WebUI.click(saveBtn) + WebUI.waitForElementNotHasAttribute(saveBtn, "disabled", 10) WebUI.waitForElementNotHasAttribute(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), "disabled", 10) WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) WebUI.waitForElementNotPresent(saveBtn, 10) //wait for the modal window to close @@ -310,8 +312,9 @@ class Requester_step_def_ks { def requester_views_request_they_created(){ if (WebUI.getUrl() != GlobalVariable.OCWA_URL) { WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - WebUI.waitForPageLoad(20) + } + WebUI.waitForPageLoad(20) TestObject linkToRequest = get_test_object_by_text(g_requestName) WebUI.waitForElementVisible(linkToRequest, 20) @@ -377,7 +380,7 @@ class Requester_step_def_ks { WebUI.waitForPageLoad(20) WebUI.comment("current page (should be request page):${WebUI.getUrl()}") - WebUI.waitForAngularLoad(10) + //WebUI.waitForAngularLoad(10) WebUI.verifyTextPresent(g_requestName, false) if (numOutputFiles == "1") { diff --git a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy index 12a0ad242..9c83f1ab8 100644 --- a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy +++ b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy @@ -13,9 +13,9 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +not_run: CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') -not_run: CucumberKW.runFeatureFile('Include/features/requester/create_a_new_request.feature') +CucumberKW.runFeatureFile('Include/features/requester/create_a_new_request.feature') not_run: CucumberKW.runFeatureFile('Include/features/requester/view_request_details.feature') From c2b4a6627019fb3e927e7f328b2a46feafaee874 Mon Sep 17 00:00:00 2001 From: PaulR Date: Mon, 21 Jan 2019 12:29:56 -0800 Subject: [PATCH 184/226] switched back to draft tests; added search to tests --- .../groovy/Requester_step_def_ks.groovy | 23 +++++++++++++------ .../Script1545256102660.groovy | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 055f3edb8..f4ea9527a 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -66,6 +66,7 @@ class Requester_step_def_ks { String LOGOUT_URL = "/auth/logout" //String NEW_REQUEST_DIALOG_HEADER_TEXT = "Initiate a New Request" String NEW_REQUEST_DIALOG_ID = "request-form" + String SEARCH_BOX_ID = "requests-list-search" String g_requestName = "" @@ -273,7 +274,11 @@ class Requester_step_def_ks { @When("the requester saves their request") def requester_saves_new_request() { - + + // may not make a difference + TestObject uploadFileButton = get_test_object_by_id(REQUEST_FILES_UPLOAD_BTN_ID) + WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) + TestObject saveCloseBtn = get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID) WebUI.waitForElementNotHasAttribute(saveCloseBtn, "disabled", 10) WebUI.waitForElementVisible(saveCloseBtn, 10) @@ -281,7 +286,7 @@ class Requester_step_def_ks { WebUI.comment("waiting for Save and Close button to be clickable timed out") } WebUI.click(saveCloseBtn) - + //WebUI.waitForElementNotHasAttribute(saveCloseBtn, "disabled", 10) // may not be necessary WebUI.waitForElementNotPresent(saveCloseBtn, 10) //wait for the modal window to close } @@ -294,7 +299,7 @@ class Requester_step_def_ks { WebUI.waitForElementNotHasAttribute(saveBtn, "disabled", 10) WebUI.waitForElementNotHasAttribute(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), "disabled", 10) WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) - + WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) WebUI.waitForElementNotPresent(saveBtn, 10) //wait for the modal window to close @@ -312,9 +317,12 @@ class Requester_step_def_ks { def requester_views_request_they_created(){ if (WebUI.getUrl() != GlobalVariable.OCWA_URL) { WebUI.navigateToUrl(GlobalVariable.OCWA_URL) - + } WebUI.waitForPageLoad(20) + TestObject searchBox = get_test_object_by_id(SEARCH_BOX_ID) + WebUI.setText(searchBox, g_requestName) + TestObject linkToRequest = get_test_object_by_text(g_requestName) WebUI.waitForElementVisible(linkToRequest, 20) @@ -365,8 +373,9 @@ class Requester_step_def_ks { def confirm_draft_save_was_successful(String numOutputFiles, String numSupportingFiles){ //requester_views_request_they_created() WebUI.comment("current page (should be main page):${WebUI.getUrl()}") - //if (!WebUI.verifyTextNotPresent(NEW_REQUEST_DIALOG_HEADER_TEXT, false, FailureHandling.OPTIONAL)) { WebUI.comment("the new request dialog is still open (and it shouldn't be at this point)") } - //if (WebUI.verifyElementNotInViewport(get_test_object_by_id(NEW_REQUEST_DIALOG_ID), 1, FailureHandling.OPTIONAL)) + TestObject searchBox = get_test_object_by_id(SEARCH_BOX_ID) + WebUI.setText(searchBox, g_requestName) + if (!WebUI.verifyTextPresent(g_requestName, false)) { WebUI.comment("unable to find the text:$g_requestName on the page. This text is used to find the request link") } @@ -380,7 +389,7 @@ class Requester_step_def_ks { WebUI.waitForPageLoad(20) WebUI.comment("current page (should be request page):${WebUI.getUrl()}") - //WebUI.waitForAngularLoad(10) + WebUI.verifyTextPresent(g_requestName, false) if (numOutputFiles == "1") { diff --git a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy index 9c83f1ab8..12a0ad242 100644 --- a/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy +++ b/ui_tests/Scripts/RunCucumberTests/Script1545256102660.groovy @@ -13,9 +13,9 @@ import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI import internal.GlobalVariable as GlobalVariable -not_run: CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') +CucumberKW.runFeatureFile('Include/features/requester/draft_requests.feature') -CucumberKW.runFeatureFile('Include/features/requester/create_a_new_request.feature') +not_run: CucumberKW.runFeatureFile('Include/features/requester/create_a_new_request.feature') not_run: CucumberKW.runFeatureFile('Include/features/requester/view_request_details.feature') From ae3e3fcf8cdad865527c32527e9bf4983add4481 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 22 Jan 2019 08:50:14 -0800 Subject: [PATCH 185/226] add 1 sec delay for all actions --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 4 ++-- .../internal/com.kms.katalon.execution.webui.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index f4ea9527a..77e4fcc92 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -274,11 +274,11 @@ class Requester_step_def_ks { @When("the requester saves their request") def requester_saves_new_request() { - + // may not make a difference TestObject uploadFileButton = get_test_object_by_id(REQUEST_FILES_UPLOAD_BTN_ID) WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) - + TestObject saveCloseBtn = get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID) WebUI.waitForElementNotHasAttribute(saveCloseBtn, "disabled", 10) WebUI.waitForElementVisible(saveCloseBtn, 10) diff --git a/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties index ebe677f9a..0d1016559 100644 --- a/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties +++ b/ui_tests/settings/internal/com.kms.katalon.execution.webui.properties @@ -1,7 +1,7 @@ -#Wed Jan 02 14:47:57 PST 2019 +#Tue Jan 22 08:47:21 PST 2019 execution.default.selectingCapturedObjectSelectorMethod="XPATH" execution.default.webUi.enablePageLoadTimeout=false execution.default.webUi.pageLoadTimeout=30 execution.default.webUi.ignorePageLoadTimeOutException=false -execution.default.webUi.actionDelay=0 +execution.default.webUi.actionDelay=1 execution.default.waitForIEHanging=600 From 880243dba9a29be37a2a7b9dc0b6bca086e23476 Mon Sep 17 00:00:00 2001 From: PaulR Date: Tue, 22 Jan 2019 16:52:21 -0800 Subject: [PATCH 186/226] testing if Travis issue is related to inline ajax call --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 77e4fcc92..4bb641ac8 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -389,9 +389,11 @@ class Requester_step_def_ks { WebUI.waitForPageLoad(20) WebUI.comment("current page (should be request page):${WebUI.getUrl()}") + WebUI.verifyTextPresent(g_requestName, false) - + WebUI.delay(5) // we need to do a hard delay here to give time for the inline ajax to finish + if (numOutputFiles == "1") { WebUI.verifyTextPresent(GlobalVariable.ValidFileName, false) } From e8e36ef4e61c44354c248de7b89b838c78a4985f Mon Sep 17 00:00:00 2001 From: PaulR Date: Wed, 23 Jan 2019 17:04:10 -0800 Subject: [PATCH 187/226] removed test lines that created an issue when no files are uploaded --- ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 4bb641ac8..6a6eef57b 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -275,9 +275,7 @@ class Requester_step_def_ks { @When("the requester saves their request") def requester_saves_new_request() { - // may not make a difference - TestObject uploadFileButton = get_test_object_by_id(REQUEST_FILES_UPLOAD_BTN_ID) - WebUI.waitForElementNotHasAttribute(uploadFileButton, "disabled", 10) + TestObject saveCloseBtn = get_test_object_by_id(REQUEST_SAVE_CLOSE_BTN_ID) WebUI.waitForElementNotHasAttribute(saveCloseBtn, "disabled", 10) From dcb5fba8483bb59d9889385c1f851eadf5af6906 Mon Sep 17 00:00:00 2001 From: PaulR Date: Fri, 25 Jan 2019 15:50:38 -0800 Subject: [PATCH 188/226] add api request test to travis script; minor fix for re-submit test --- .travis.yml | 20 ++----------------- .../groovy/Requester_step_def_ks.groovy | 9 +++++++-- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56955238d..e3a59c1c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -422,22 +422,6 @@ matrix: - g++-4.8 - python3-pip - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - npm install -g yarn --cache-min 999999999 - script: - cd /usr/local/bin - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip @@ -451,7 +435,7 @@ matrix: - terraform init - terraform plan -var hostRootPath=`pwd`/_tmp - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve - - terraform show + - docker exec ocwa_frontend wget http://ocwa_request_api:3002 - ls -l _tmp - docker ps - sleep 5 @@ -468,7 +452,7 @@ matrix: - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - #RUN Integration Tests + #RUN Integration - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" diff --git a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy index 6a6eef57b..946dd6276 100644 --- a/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy +++ b/ui_tests/Include/scripts/groovy/Requester_step_def_ks.groovy @@ -466,13 +466,18 @@ class Requester_step_def_ks { WebUI.comment("current page (should be request page):${WebUI.getUrl()}") WebUI.click(get_test_object_by_id(REQUEST_EDIT_BTN_ID)) WebUI.setText(get_test_object_by_id(REQUEST_PURPOSE_TXT_ID), EDITED_PURPOSE_TEXT) + + // click Add Files button + TestObject requestFormSaveFilesButton = get_test_object_by_id(REQUEST_SAVE_FILES_BTN_ID) + WebUI.waitForElementClickable(requestFormSaveFilesButton, 30) + WebUI.click(requestFormSaveFilesButton) } @Then("requester should be able to re-submit the request") def requester_should_be_able_to_resubmit_request(){ + WebUI.waitForElementNotHasAttribute(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), "disabled", 10) WebUI.waitForElementClickable(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review'), 30) WebUI.click(findTestObject('Object Repository/Page_OCWA Development Version/span_Submit for Review')) - //WebUI.delay(5) - request_should_be_in_given_status("Review in progress") + request_should_be_in_given_status("Awaiting Review") WebUI.closeBrowser() } From 5e2ee936ae6d6cee1461b6f8379044ae81e7c8cf Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Fri, 25 Jan 2019 16:24:44 -0800 Subject: [PATCH 189/226] Updates to support new code changes --- terraform/ocwa_frontend.tf | 6 ------ terraform/ocwa_request_api.tf | 10 +++++++++- terraform/ocwa_storage_api.tf | 5 +++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/terraform/ocwa_frontend.tf b/terraform/ocwa_frontend.tf index 7f7b6e90b..158cb006e 100644 --- a/terraform/ocwa_frontend.tf +++ b/terraform/ocwa_frontend.tf @@ -17,12 +17,6 @@ resource "docker_container" "ocwa_frontend" { internal = 8000 external = 8000 } - host = [ - { - host = "${var.authHostname}" - ip = "${docker_container.ocwa_nginx.ip_address}" - } - ] env = [ "COOKIE_SECRET=${random_string.cookie.result}", diff --git a/terraform/ocwa_request_api.tf b/terraform/ocwa_request_api.tf index 359c0203d..0202d338c 100644 --- a/terraform/ocwa_request_api.tf +++ b/terraform/ocwa_request_api.tf @@ -41,7 +41,15 @@ resource "docker_container" "ocwa_request_api" { "STORAGE_WARN_SIZE=10m", "STORAGE_MAX_SIZE=10m", "STORAGE_KEY=${random_id.accessKey.hex}", - "STORAGE_SECRET=${random_string.secretKey.result}" + "STORAGE_SECRET=${random_string.secretKey.result}", + "OCWA_URL=${var.ocwaHost}", + "EMAIL_ENABLED=false", + "EMAIL_SERVICE=na", + "EMAIL_SECURE=false", + "EMAIL_PORT=25", + "EMAIL_USER=user", + "EMAIL_PASSWORD=password", + "EMAIL_FROM=no-reply@gmail.com" ] } diff --git a/terraform/ocwa_storage_api.tf b/terraform/ocwa_storage_api.tf index 3440dcecc..08d54a62b 100644 --- a/terraform/ocwa_storage_api.tf +++ b/terraform/ocwa_storage_api.tf @@ -53,14 +53,15 @@ resource "docker_container" "tusd" { container_path = "/srv/tusd-hooks" } restart = "on-failure" - command = [ "--hooks-dir", "/srv/tusd-hooks", "-behind-proxy", "-s3-bucket", "bucket", "-s3-endpoint", "http://ocwaminio:9000" ] networks_advanced = { name = "${docker_network.private_network.name}" } env = [ "AWS_ACCESS_KEY=${random_id.accessKey.hex}", "AWS_SECRET_ACCESS_KEY=${random_string.secretKey.result}", "AWS_REGION=not_applicable", "JWT_SECRET=${random_string.jwtSecret.result}", - "JWT_AUD=outputchecker" + "JWT_AUD=outputchecker", + "S3_ENDPOINT=http://ocwaminio:9000", + "S3_BUCKET=bucket -behind-proxy" ] } From b8682bc126385d967f559dc85baf538a2d40d21f Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 08:58:36 -0800 Subject: [PATCH 190/226] tweak test for ocwa spin up --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3a59c1c6..3788dca57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -435,12 +435,12 @@ matrix: - terraform init - terraform plan -var hostRootPath=`pwd`/_tmp - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve - - docker exec ocwa_frontend wget http://ocwa_request_api:3002 - ls -l _tmp - docker ps - - sleep 5 - - curl -v -k https://auth.example.demo - - curl -v -k https://ocwa.example.demo + - sleep 30 + - docker ps + - docker exec ocwa_frontend wget http://ocwa_request_api:3002 + - docker exec ocwa_frontend wget http://ocwa_forum_api:3000 #Katalon requires OpenJDK 8 installed separately - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk From d79646fb2d908a82788d9d520264a7e1303d967f Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 10:14:48 -0800 Subject: [PATCH 191/226] tweaks and faster testing --- .travis.yml | 782 ++++++++++++++++++++++++++-------------------------- 1 file changed, 392 insertions(+), 390 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3788dca57..948a0c398 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,396 +13,396 @@ addons: matrix: include: - - name: "Forum Api" - stage: "APIs" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - before_script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - helm lint helm/forum-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Request Api" - stage: "APIs" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - npm install - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - helm lint helm/request-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Policy Api" - stage: "APIs" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - helm lint helm/policy-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Validation Api" - stage: "APIs" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - helm lint helm/validate-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Front End" - stage: "Frontend" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Scan - Python" - stage: "Tests" - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1 -m pytest - - sudo coverage xml - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - - - name: "Scan - NodeJS" - stage: "Tests" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - - before_script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - - cd /home/travis/build/bcgov/OCWA/frontend - - npm test - - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - - name: "OCWA Master Helm Chart" - stage: "Tests" - language: node_js - node_js: - - "node" - cache: npm - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa +# - name: "Forum Api" +# stage: "APIs" +# language: node_js +# node_js: +# - "node" +# cache: npm +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - g++-4.8 +# before_script: +# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi +# - cp config/test.json.example config/test.json +# - cp config/default.json.example config/default.json +# - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz +# - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz +# - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data +# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork +# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' +# - wget -q ${HELM_URL}/${HELM_TGZ} +# - tar xzfv ${HELM_TGZ} +# - PATH=`pwd`/linux-amd64/:$PATH +# - helm init --client-only +# # Installig pip deps +# - sudo pip install yamllint=="${YAMLLINT_VERSION}" +# +# before_install: +# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi +# - npm install +# +# script: +# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi +# - npm test +# - helm lint helm/forum-api +# - bash docker_quayio_push +# +# before_deploy: +# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi +# +# deploy: +# provider: script +# script: bash docker_push +# on: +# all_branches: true +# condition: $TRAVIS_BRANCH =~ ^master|develop$ +# +# - name: "Request Api" +# stage: "APIs" +# language: node_js +# node_js: +# - "node" +# cache: npm +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - g++-4.8 +# - python3-pip +# before_script: +# - wget -q ${HELM_URL}/${HELM_TGZ} +# - tar xzfv ${HELM_TGZ} +# - PATH=`pwd`/linux-amd64/:$PATH +# - helm init --client-only +# # Installig pip deps +# - sudo pip install yamllint=="${YAMLLINT_VERSION}" +# +# script: +# - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz +# - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz +# - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data +# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork +# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' +# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi +# - cp config/test.json.example config/test.json +# - cp config/default.json.example config/default.json +# - npm install +# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi +# - npm install +# - cp config/default.json.example config/default.json +# - cp config/test.json.example config/test.json +# - NODE_ENV=test npm start & +# - wget https://dl.minio.io/server/minio/release/linux-amd64/minio +# - chmod +x minio +# - export MINIO_ACCESS_KEY="myKey" +# - export MINIO_SECRET_KEY="mySecret" +# - ./minio server /tmp & +# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi +# - sudo pip3 install -U setuptools +# - sudo pip3 install -r requirements.txt +# - cp config/default.json.template config/default.json +# - sudo pip3 install -e . +# - python3 wsgi.py & +# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi +# - sudo pip3 install -U setuptools +# - sudo pip3 install -r requirements.txt +# - cp config/default.json.template config/default.json +# - sudo pip3 install -e . +# - python3 wsgi.py & +# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi +# - sleep 15 +# - npm test +# - helm lint helm/request-api +# - bash docker_quayio_push +# +# before_deploy: +# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi +# +# deploy: +# provider: script +# script: bash docker_push +# on: +# all_branches: true +# condition: $TRAVIS_BRANCH =~ ^master|develop$ +# +# - name: "Policy Api" +# stage: "APIs" +# language: python +# python: +# - "3.6" +# cache: pip +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - python3-pip +# +# install: +# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi +# - sudo pip3 install -U setuptools +# - sudo pip3 install -r requirements.txt +# +# script: +# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi +# - cp config/default.json.template config/default.json +# - sudo pip3 install -e . +# - sudo pytest +# - wget -q ${HELM_URL}/${HELM_TGZ} +# - tar xzfv ${HELM_TGZ} +# - PATH=`pwd`/linux-amd64/:$PATH +# - helm init --client-only +# # Installig pip deps +# - sudo pip install yamllint=="${YAMLLINT_VERSION}" +# - helm lint helm/policy-api +# - bash docker_quayio_push +# +# before_deploy: +# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi +# +# deploy: +# provider: script +# script: bash docker_push +# on: +# all_branches: true +# condition: $TRAVIS_BRANCH =~ ^master|develop$ +# +# - name: "Validation Api" +# stage: "APIs" +# language: python +# python: +# - "3.6" +# cache: pip +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - python3-pip +# before_script: +# - wget -q ${HELM_URL}/${HELM_TGZ} +# - tar xzfv ${HELM_TGZ} +# - PATH=`pwd`/linux-amd64/:$PATH +# - helm init --client-only +# # Installig pip deps +# - sudo pip install yamllint=="${YAMLLINT_VERSION}" +# +# before_install: +# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi +# install: +# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi +# - sudo pip3 install -U setuptools +# - sudo pip3 install -r requirements.txt +# +# script: +# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi +# - sudo pip3 install -U setuptools +# - sudo pip3 install -r requirements.txt +# - cp config/default.json.template config/default.json +# - sudo pip3 install -e . +# - python3 wsgi.py & +# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi +# - cp config/default.json.template config/default.json +# - sudo pip3 install -e . +# - sudo coverage run --branch --source=db,v1,validator -m pytest +# - helm lint helm/validate-api +# - bash docker_quayio_push +# +# before_deploy: +# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi +# +# deploy: +# provider: script +# script: bash docker_push +# on: +# all_branches: true +# condition: $TRAVIS_BRANCH =~ ^master|develop$ +# +# - name: "Front End" +# stage: "Frontend" +# language: node_js +# node_js: +# - "node" +# cache: npm +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - g++-4.8 +# +# before_script: +# - cd /home/travis/build/bcgov/OCWA/frontend +# - wget -q ${HELM_URL}/${HELM_TGZ} +# - tar xzfv ${HELM_TGZ} +# - PATH=`pwd`/linux-amd64/:$PATH +# - helm init --client-only +# # Installig pip deps +# - sudo pip install yamllint=="${YAMLLINT_VERSION}" +# before_install: +# - npm install -g yarn --cache-min 999999999 +# +# script: +# - cd /home/travis/build/bcgov/OCWA/frontend +# - cp config/test.json.example config/test.json +# - yarn +# - npm test +# - helm lint helm/ocwa-frontend +# - bash docker_quayio_push ocwa_frontend +# +# before_deploy: +# - cd /home/travis/build/bcgov/OCWA/frontend +# +# deploy: +# provider: script +# script: bash docker_push +# on: +# all_branches: true +# condition: $TRAVIS_BRANCH =~ ^master|develop$ +# +# - name: "Scan - Python" +# stage: "Tests" +# python: +# - "3.6" +# cache: pip +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - python3-pip +# before_script: +# - cd /home/travis/build/bcgov/OCWA +# - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip +# - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip +# - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH +# - sudo pip install yamllint=="${YAMLLINT_VERSION}" +# +# install: +# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi +# - sudo pip3 install -U setuptools +# - sudo pip3 install -r requirements.txt +# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi +# - sudo pip3 install -r requirements.txt +# +# script: +# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi +# - cp config/default.json.template config/default.json +# - sudo pip3 install -e . +# - sudo coverage run --branch --source=db,v1,validator -m pytest +# - sudo coverage xml +# +# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi +# - cp config/default.json.template config/default.json +# - sudo pip3 install -e . +# - sudo coverage run --branch --source=db,v1 -m pytest +# - sudo coverage xml +# +# - cd /home/travis/build/bcgov/OCWA +# - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH +# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi +# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi +# +# - name: "Scan - NodeJS" +# stage: "Tests" +# language: node_js +# node_js: +# - "node" +# cache: npm +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - g++-4.8 +# - python3-pip +# +# before_script: +# - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz +# - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz +# - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data +# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork +# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' +# +# - cd /home/travis/build/bcgov/OCWA +# - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip +# - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip +# - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH +# +# +# before_install: +# - npm install -g yarn --cache-min 999999999 +# +# script: +# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi +# - cp config/test.json.example config/test.json +# - cp config/default.json.example config/default.json +# - yarn +# +# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi +# - cp config/test.json.example config/test.json +# - cp config/default.json.example config/default.json +# - yarn +# +# - cd /home/travis/build/bcgov/OCWA/frontend +# - cp config/test.json.example config/test.json +# - yarn +# +# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi +# - npm test +# +# - NODE_ENV=test npm start & +# - wget https://dl.minio.io/server/minio/release/linux-amd64/minio +# - chmod +x minio +# - export MINIO_ACCESS_KEY="myKey" +# - export MINIO_SECRET_KEY="mySecret" +# - ./minio server /tmp & +# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi +# - sudo pip3 install -U setuptools +# - sudo pip3 install -r requirements.txt +# - cp config/default.json.template config/default.json +# - sudo pip3 install -e . +# - python3 wsgi.py & +# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi +# - sudo pip3 install -U setuptools +# - sudo pip3 install -r requirements.txt +# - cp config/default.json.template config/default.json +# - sudo pip3 install -e . +# - python3 wsgi.py & +# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi +# - sleep 15 +# - npm test +# +# - cd /home/travis/build/bcgov/OCWA/frontend +# - npm test +# +# - cd /home/travis/build/bcgov/OCWA +# - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH +# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend +# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi +# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi +# +# - name: "OCWA Master Helm Chart" +# stage: "Tests" +# language: node_js +# node_js: +# - "node" +# cache: npm +# script: +# - cd /home/travis/build/bcgov/OCWA +# - wget -q ${HELM_URL}/${HELM_TGZ} +# - tar xzfv ${HELM_TGZ} +# - PATH=`pwd`/linux-amd64/:$PATH +# - helm init --client-only +# # Installig pip deps +# - sudo pip install yamllint=="${YAMLLINT_VERSION}" +# - cd /home/travis/build/bcgov/OCWA +# - helm lint helm/ocwa - name: "Integration Tests" stage: "Tests" @@ -439,6 +439,8 @@ matrix: - docker ps - sleep 30 - docker ps + - docker logs ocwa_request_api + - docker logs ocwa_forum_api - docker exec ocwa_frontend wget http://ocwa_request_api:3002 - docker exec ocwa_frontend wget http://ocwa_forum_api:3000 From 32014f5d3c5600b4cf4e89b4cb15317bb87d4aee Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 10:56:20 -0800 Subject: [PATCH 192/226] db tweaks --- terraform/mongodb.tf | 2 +- terraform/postgres.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/mongodb.tf b/terraform/mongodb.tf index cf2126373..23eca9f42 100644 --- a/terraform/mongodb.tf +++ b/terraform/mongodb.tf @@ -38,7 +38,7 @@ resource "null_resource" "mongodb_first_time_install" { environment = { SCRIPT_PATH = "${var.hostRootPath}" } - command = "docker run --net=ocwa_vnet -v $SCRIPT_PATH:/work mongo:4.1.3 mongo mongodb://ocwa_mongodb/oc_db /work/mongodb_script.js" + command = "docker exec ocwa_mongodb mongo mongodb://ocwa_mongodb/oc_db /work/mongodb_script.js" } depends_on = ["docker_container.ocwa_mongodb"] } diff --git a/terraform/postgres.tf b/terraform/postgres.tf index 8ba02f206..ce1764c5b 100644 --- a/terraform/postgres.tf +++ b/terraform/postgres.tf @@ -53,7 +53,7 @@ resource "null_resource" "postgres_first_time_install" { POSTGRES_USER = "padmin" POSTGRES_PASSWORD = "${random_string.postgresSuperPassword.result}" } - command = "docker run --net=ocwa_vnet -v $SCRIPT_PATH:/work postgres:9.6.9 psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres -f /work/postgres_script.psql" + command = "docker exec --net=ocwa_vnet -v \"$SCRIPT_PATH:/work\" ocwa_postgres psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres -f /work/postgres_script.psql" } depends_on = ["docker_container.ocwa_postgres"] From 2abc39805097d5edbf04af828772b9cde892c530 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 11:05:42 -0800 Subject: [PATCH 193/226] tweaks to the db provisioning --- terraform/mongodb.tf | 2 +- terraform/postgres.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/mongodb.tf b/terraform/mongodb.tf index 23eca9f42..c9bf5ce83 100644 --- a/terraform/mongodb.tf +++ b/terraform/mongodb.tf @@ -38,7 +38,7 @@ resource "null_resource" "mongodb_first_time_install" { environment = { SCRIPT_PATH = "${var.hostRootPath}" } - command = "docker exec ocwa_mongodb mongo mongodb://ocwa_mongodb/oc_db /work/mongodb_script.js" + command = "docker exec ocwa_mongodb mongo mongodb://ocwa_mongodb/oc_db ${data.template_file.mongodb_script.rendered}" } depends_on = ["docker_container.ocwa_mongodb"] } diff --git a/terraform/postgres.tf b/terraform/postgres.tf index ce1764c5b..153ede476 100644 --- a/terraform/postgres.tf +++ b/terraform/postgres.tf @@ -53,7 +53,7 @@ resource "null_resource" "postgres_first_time_install" { POSTGRES_USER = "padmin" POSTGRES_PASSWORD = "${random_string.postgresSuperPassword.result}" } - command = "docker exec --net=ocwa_vnet -v \"$SCRIPT_PATH:/work\" ocwa_postgres psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres -f /work/postgres_script.psql" + command = "docker exec ocwa_postgres psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres ${data.template_file.postgres_script.rendered}" } depends_on = ["docker_container.ocwa_postgres"] From 3ab2e83923c21f09480f2bde8faf8d7834e99b4a Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 11:16:04 -0800 Subject: [PATCH 194/226] tweaks to the db provisioning --- terraform/mongodb.tf | 2 +- terraform/postgres.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/mongodb.tf b/terraform/mongodb.tf index c9bf5ce83..e8816a18a 100644 --- a/terraform/mongodb.tf +++ b/terraform/mongodb.tf @@ -38,7 +38,7 @@ resource "null_resource" "mongodb_first_time_install" { environment = { SCRIPT_PATH = "${var.hostRootPath}" } - command = "docker exec ocwa_mongodb mongo mongodb://ocwa_mongodb/oc_db ${data.template_file.mongodb_script.rendered}" + command = "docker exec ocwa_mongodb mongo mongodb://ocwa_mongodb/oc_db \"${data.template_file.mongodb_script.rendered}\"" } depends_on = ["docker_container.ocwa_mongodb"] } diff --git a/terraform/postgres.tf b/terraform/postgres.tf index 153ede476..4b253353a 100644 --- a/terraform/postgres.tf +++ b/terraform/postgres.tf @@ -53,7 +53,7 @@ resource "null_resource" "postgres_first_time_install" { POSTGRES_USER = "padmin" POSTGRES_PASSWORD = "${random_string.postgresSuperPassword.result}" } - command = "docker exec ocwa_postgres psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres ${data.template_file.postgres_script.rendered}" + command = "docker exec ocwa_postgres psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres \"${data.template_file.postgres_script.rendered}\"" } depends_on = ["docker_container.ocwa_postgres"] From 7c82676ddc735de41813255e27b7406bf48fb4d7 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 11:24:49 -0800 Subject: [PATCH 195/226] tweaks to the db provisioning --- terraform/mongodb.tf | 2 +- terraform/postgres.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/mongodb.tf b/terraform/mongodb.tf index e8816a18a..65128b0fb 100644 --- a/terraform/mongodb.tf +++ b/terraform/mongodb.tf @@ -38,7 +38,7 @@ resource "null_resource" "mongodb_first_time_install" { environment = { SCRIPT_PATH = "${var.hostRootPath}" } - command = "docker exec ocwa_mongodb mongo mongodb://ocwa_mongodb/oc_db \"${data.template_file.mongodb_script.rendered}\"" + command = "cat ${var.hostRootPath}/mongodb_script.js | docker exec ocwa_mongodb mongo mongodb://ocwa_mongodb/oc_db" } depends_on = ["docker_container.ocwa_mongodb"] } diff --git a/terraform/postgres.tf b/terraform/postgres.tf index 4b253353a..46a7120ce 100644 --- a/terraform/postgres.tf +++ b/terraform/postgres.tf @@ -53,8 +53,8 @@ resource "null_resource" "postgres_first_time_install" { POSTGRES_USER = "padmin" POSTGRES_PASSWORD = "${random_string.postgresSuperPassword.result}" } - command = "docker exec ocwa_postgres psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres \"${data.template_file.postgres_script.rendered}\"" + command = "cat ${var.hostRootPath}/postgres_script.psql | docker exec ocwa_postgres psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres" } - depends_on = ["docker_container.ocwa_postgres"] + depends_on = ["docker_container.ocwa_postgres", "local_file.postgres_script"] } From a869b013998258b19128c79d026081a002991095 Mon Sep 17 00:00:00 2001 From: Joshua Date: Mon, 28 Jan 2019 11:41:46 -0800 Subject: [PATCH 196/226] Fix scrolling issues, load Unauthorized if there are no groups present as well. --- .../src/modules/app/components/app/index.jsx | 20 +++++- .../components/dashboard/index.jsx | 63 +++++-------------- .../components/dashboard/styles.css | 5 ++ .../components/request/styles.css | 3 +- .../components/requests-list/styles.css | 1 - 5 files changed, 39 insertions(+), 53 deletions(-) diff --git a/frontend/src/modules/app/components/app/index.jsx b/frontend/src/modules/app/components/app/index.jsx index fd2004620..98b31c076 100644 --- a/frontend/src/modules/app/components/app/index.jsx +++ b/frontend/src/modules/app/components/app/index.jsx @@ -1,9 +1,10 @@ import React from 'react'; +import PropTypes from 'prop-types'; import LayerManager from '@atlaskit/layer-manager'; import Loadable from 'react-loadable'; import includes from 'lodash/includes'; import Messages from '@src/modules/data/containers/messages'; -import PropTypes from 'prop-types'; +import some from 'lodash/some'; import '@atlaskit/css-reset'; import Auth from '../auth'; @@ -36,11 +37,24 @@ class App extends React.Component { renderMain = () => { const { authFetchStatus, isAuthenticated, user } = this.props; + // TODO: These values should be in config.json + const exporterGroup = '/exporter'; + const ocGroup = '/oc'; + const validGroups = [exporterGroup, ocGroup]; let el = null; if (isAuthenticated) { - const hasExporterRole = includes(user.groups, '/exporter'); - const hasOcRole = includes(user.groups, '/oc'); + // Using `includes` here incase groups isn't an array depending on the auth env + const hasExporterRole = includes(user.groups, exporterGroup); + const hasOcRole = includes(user.groups, ocGroup); + const hasValidGroupAccess = some(user.groups, g => + validGroups.includes(g) + ); + console.log(hasExporterRole, hasOcRole, hasValidGroupAccess); + + if (!hasValidGroupAccess) { + return ; + } // Load bundle for output checker if that's the only role, otherwise always send exporter if (hasOcRole && !hasExporterRole) { diff --git a/frontend/src/modules/output-checker/components/dashboard/index.jsx b/frontend/src/modules/output-checker/components/dashboard/index.jsx index 0eb79cfbe..6bf5b1d50 100644 --- a/frontend/src/modules/output-checker/components/dashboard/index.jsx +++ b/frontend/src/modules/output-checker/components/dashboard/index.jsx @@ -12,6 +12,13 @@ function Dashboard({ filter, onFilterChange, onSearchChange, search }) { { label: 'Show My Requests', value: 'mine' }, { label: 'Show Unassigned', value: 'unassigned' }, ]; + const columns = [ + { state: 2, title: 'Submitted' }, + { state: 3, title: 'In Review' }, + { state: 4, title: 'Approved' }, + { state: 5, title: 'Denied' }, + { state: 6, title: 'Cancelled' }, + ]; return (
@@ -36,56 +43,16 @@ function Dashboard({ filter, onFilterChange, onSearchChange, search }) {
-
-
-

Submitted

-
-
-
- -
-
-
-
-
-

In Review

-
-
-
- -
-
-
-
-
-

Approved

-
-
-
- -
-
-
-
-
-

Denied

-
-
-
- -
-
-
-
-
-

Cancelled

-
-
-
- + {columns.map(c => ( +
+
+

{c.title}

+
+
+
-
+ ))}
diff --git a/frontend/src/modules/output-checker/components/dashboard/styles.css b/frontend/src/modules/output-checker/components/dashboard/styles.css index 2a5acb2e1..3efd0cbb0 100644 --- a/frontend/src/modules/output-checker/components/dashboard/styles.css +++ b/frontend/src/modules/output-checker/components/dashboard/styles.css @@ -46,3 +46,8 @@ .column header { margin: 10px 20px; } + +.list { + flex: 1; + overflow-y: auto; +} diff --git a/frontend/src/modules/output-checker/components/request/styles.css b/frontend/src/modules/output-checker/components/request/styles.css index b0a548ce1..13a1b3c44 100644 --- a/frontend/src/modules/output-checker/components/request/styles.css +++ b/frontend/src/modules/output-checker/components/request/styles.css @@ -48,7 +48,6 @@ .main { position: relative; - display: flex; flex: 1; overflow-y: auto; background-color: #fff; @@ -56,6 +55,7 @@ .main > div { flex: 1; + padding: 0 0 20px; margin: 20px 300px 20px 20px; } @@ -63,6 +63,7 @@ width: 300px; padding: 20px; position: fixed; + top: 178px; right: 0; box-sizing: border-box; } diff --git a/frontend/src/modules/output-checker/components/requests-list/styles.css b/frontend/src/modules/output-checker/components/requests-list/styles.css index 8e1fc01a7..a8e2242b1 100644 --- a/frontend/src/modules/output-checker/components/requests-list/styles.css +++ b/frontend/src/modules/output-checker/components/requests-list/styles.css @@ -1,4 +1,3 @@ .container { flex: 1; - overflow-y: auto; } From 97655bfeff8d37646060adce806a108ffff8a276 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 11:44:04 -0800 Subject: [PATCH 197/226] tweaks to the db provisioning --- terraform/scripts/mongodb.tpl | 1 + terraform/scripts/psql.tpl | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/terraform/scripts/mongodb.tpl b/terraform/scripts/mongodb.tpl index 1a6b55a08..d977fea5c 100644 --- a/terraform/scripts/mongodb.tpl +++ b/terraform/scripts/mongodb.tpl @@ -15,3 +15,4 @@ db.rules.insert({name:"restricted_file_types", source:"print('$${file.extension} db.rules.insert({name:"file_size_under_3.5mb", source:"print($${file.size}<3500000)",mandatory:false }); db.rules.insert({name:"file_size_under_5mb", source:"print($${file.size}<5000000)",mandatory:true }); +exit; diff --git a/terraform/scripts/psql.tpl b/terraform/scripts/psql.tpl index ed3b92784..72fb22019 100644 --- a/terraform/scripts/psql.tpl +++ b/terraform/scripts/psql.tpl @@ -1,3 +1,4 @@ CREATE DATABASE keycloak; CREATE USER ${POSTGRES_APP_USERNAME} WITH ENCRYPTED PASSWORD '${POSTGRES_APP_PASSWORD}'; -GRANT ALL PRIVILEGES ON DATABASE keycloak TO ${POSTGRES_APP_USERNAME}; \ No newline at end of file +GRANT ALL PRIVILEGES ON DATABASE keycloak TO ${POSTGRES_APP_USERNAME}; +\q \ No newline at end of file From ea414a9ce2cffa2e352177970fef5f5f2e364235 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 12:13:25 -0800 Subject: [PATCH 198/226] tweaks to the db provisioning --- terraform/mongodb.tf | 2 +- terraform/postgres.tf | 4 ++-- terraform/scripts/mongodb.tpl | 1 - terraform/scripts/psql.tpl | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/terraform/mongodb.tf b/terraform/mongodb.tf index 65128b0fb..98724c280 100644 --- a/terraform/mongodb.tf +++ b/terraform/mongodb.tf @@ -38,7 +38,7 @@ resource "null_resource" "mongodb_first_time_install" { environment = { SCRIPT_PATH = "${var.hostRootPath}" } - command = "cat ${var.hostRootPath}/mongodb_script.js | docker exec ocwa_mongodb mongo mongodb://ocwa_mongodb/oc_db" + command = "sleep 15; docker run --net=ocwa_vnet -v \"$SCRIPT_PATH:/work\" mongo:4.1.3 mongo mongodb://ocwa_mongodb/oc_db /work/mongodb_script.js" } depends_on = ["docker_container.ocwa_mongodb"] } diff --git a/terraform/postgres.tf b/terraform/postgres.tf index 46a7120ce..746702e05 100644 --- a/terraform/postgres.tf +++ b/terraform/postgres.tf @@ -53,8 +53,8 @@ resource "null_resource" "postgres_first_time_install" { POSTGRES_USER = "padmin" POSTGRES_PASSWORD = "${random_string.postgresSuperPassword.result}" } - command = "cat ${var.hostRootPath}/postgres_script.psql | docker exec ocwa_postgres psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres" + command = "sleep 15; docker run --net=ocwa_vnet -v \"$SCRIPT_PATH:/work\" postgres:9.6.9 psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres -f /work/postgres_script.psql" } - depends_on = ["docker_container.ocwa_postgres", "local_file.postgres_script"] + depends_on = ["docker_container.ocwa_postgres"] } diff --git a/terraform/scripts/mongodb.tpl b/terraform/scripts/mongodb.tpl index d977fea5c..1a6b55a08 100644 --- a/terraform/scripts/mongodb.tpl +++ b/terraform/scripts/mongodb.tpl @@ -15,4 +15,3 @@ db.rules.insert({name:"restricted_file_types", source:"print('$${file.extension} db.rules.insert({name:"file_size_under_3.5mb", source:"print($${file.size}<3500000)",mandatory:false }); db.rules.insert({name:"file_size_under_5mb", source:"print($${file.size}<5000000)",mandatory:true }); -exit; diff --git a/terraform/scripts/psql.tpl b/terraform/scripts/psql.tpl index 72fb22019..ed3b92784 100644 --- a/terraform/scripts/psql.tpl +++ b/terraform/scripts/psql.tpl @@ -1,4 +1,3 @@ CREATE DATABASE keycloak; CREATE USER ${POSTGRES_APP_USERNAME} WITH ENCRYPTED PASSWORD '${POSTGRES_APP_PASSWORD}'; -GRANT ALL PRIVILEGES ON DATABASE keycloak TO ${POSTGRES_APP_USERNAME}; -\q \ No newline at end of file +GRANT ALL PRIVILEGES ON DATABASE keycloak TO ${POSTGRES_APP_USERNAME}; \ No newline at end of file From ebe1476d07a384369529bbf824b56abe7da0b5bc Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 14:24:57 -0800 Subject: [PATCH 199/226] db tweaks, more int test debugging --- .travis.yml | 2 ++ terraform/keycloak.tf | 2 +- terraform/mongodb.tf | 5 +---- terraform/postgres.tf | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 948a0c398..4fe04a6e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -457,6 +457,8 @@ matrix: #RUN Integration - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" + - docker logs ocwa_frontend + - docker logs ocwa_request_api env: diff --git a/terraform/keycloak.tf b/terraform/keycloak.tf index c0af09ff6..0241e868f 100644 --- a/terraform/keycloak.tf +++ b/terraform/keycloak.tf @@ -45,7 +45,7 @@ resource "null_resource" "keycloak_first_time_install" { "KEYCLOAK_PASSWORD" = "${random_string.keycloakAdminPassword.result}", "KEYCLOAK_CLIENT_SECRET" = "${random_uuid.outputcheckerClientSecret.result}" } - command = "docker run --net=ocwa_vnet -e TESTUSER_PASSWORD -e KEYCLOAK_USER -e KEYCLOAK_PASSWORD -e KEYCLOAK_CLIENT_SECRET -v $PWD:/work --entrypoint /bin/bash jboss/keycloak:4.1.0.Final -c /work/scripts/keycloak-setup.sh" + command = "docker run --net=ocwa_vnet -e TESTUSER_PASSWORD -e KEYCLOAK_USER -e KEYCLOAK_PASSWORD -e KEYCLOAK_CLIENT_SECRET -v \"$PWD:/work\" --entrypoint /bin/bash jboss/keycloak:4.1.0.Final -c /work/scripts/keycloak-setup.sh" } depends_on = ["docker_container.ocwa_keycloak"] diff --git a/terraform/mongodb.tf b/terraform/mongodb.tf index 98724c280..c82fed9c1 100644 --- a/terraform/mongodb.tf +++ b/terraform/mongodb.tf @@ -31,14 +31,11 @@ resource "local_file" "mongodb_script" { } resource "null_resource" "mongodb_first_time_install" { - provisioner "local-exec" { - command = "sleep 10" - } provisioner "local-exec" { environment = { SCRIPT_PATH = "${var.hostRootPath}" } - command = "sleep 15; docker run --net=ocwa_vnet -v \"$SCRIPT_PATH:/work\" mongo:4.1.3 mongo mongodb://ocwa_mongodb/oc_db /work/mongodb_script.js" + command = "sleep 30; docker run --net=ocwa_vnet -v \"$SCRIPT_PATH:/work\" mongo:4.1.3 mongo mongodb://ocwa_mongodb/oc_db /work/mongodb_script.js" } depends_on = ["docker_container.ocwa_mongodb"] } diff --git a/terraform/postgres.tf b/terraform/postgres.tf index 746702e05..e69f51eaf 100644 --- a/terraform/postgres.tf +++ b/terraform/postgres.tf @@ -53,7 +53,7 @@ resource "null_resource" "postgres_first_time_install" { POSTGRES_USER = "padmin" POSTGRES_PASSWORD = "${random_string.postgresSuperPassword.result}" } - command = "sleep 15; docker run --net=ocwa_vnet -v \"$SCRIPT_PATH:/work\" postgres:9.6.9 psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres -f /work/postgres_script.psql" + command = "docker run --net=ocwa_vnet -v \"$SCRIPT_PATH:/work\" postgres:9.6.9 psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@ocwa_postgres -f /work/postgres_script.psql" } depends_on = ["docker_container.ocwa_postgres"] From 9d7b1bbf9771893b49dafea1a5496839e73c662c Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 15:08:02 -0800 Subject: [PATCH 200/226] tweak travis hosts for ocwa terra --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4fe04a6e1..959422819 100644 --- a/.travis.yml +++ b/.travis.yml @@ -423,6 +423,9 @@ matrix: - python3-pip script: + - ips=($(hostname -I)) + - sudo printf "$ips[0]\tauth.example.demo" > /etc/hosts + - sudo printf "$ips[0]\tocwa.example.demo" > /etc/hosts - cd /usr/local/bin - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip - sudo unzip -o terraform_0.11.8_linux_amd64.zip From 7b44b9502c20e02a5fecf08ea76ff4ba6132c310 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 15:12:53 -0800 Subject: [PATCH 201/226] using host in ocwa_frontend --- terraform/ocwa_frontend.tf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/terraform/ocwa_frontend.tf b/terraform/ocwa_frontend.tf index 158cb006e..7f7b6e90b 100644 --- a/terraform/ocwa_frontend.tf +++ b/terraform/ocwa_frontend.tf @@ -17,6 +17,12 @@ resource "docker_container" "ocwa_frontend" { internal = 8000 external = 8000 } + host = [ + { + host = "${var.authHostname}" + ip = "${docker_container.ocwa_nginx.ip_address}" + } + ] env = [ "COOKIE_SECRET=${random_string.cookie.result}", From 7ec7dbedc5e945c70d7b71d712fa531993a43852 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 15:23:54 -0800 Subject: [PATCH 202/226] fixed depends on --- .travis.yml | 9 --------- terraform/nginx-proxy.tf | 3 ++- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 959422819..21a54c74e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -423,9 +423,6 @@ matrix: - python3-pip script: - - ips=($(hostname -I)) - - sudo printf "$ips[0]\tauth.example.demo" > /etc/hosts - - sudo printf "$ips[0]\tocwa.example.demo" > /etc/hosts - cd /usr/local/bin - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip - sudo unzip -o terraform_0.11.8_linux_amd64.zip @@ -438,14 +435,8 @@ matrix: - terraform init - terraform plan -var hostRootPath=`pwd`/_tmp - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve - - ls -l _tmp - - docker ps - sleep 30 - docker ps - - docker logs ocwa_request_api - - docker logs ocwa_forum_api - - docker exec ocwa_frontend wget http://ocwa_request_api:3002 - - docker exec ocwa_frontend wget http://ocwa_forum_api:3000 #Katalon requires OpenJDK 8 installed separately - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk diff --git a/terraform/nginx-proxy.tf b/terraform/nginx-proxy.tf index 4daae223e..60e905908 100644 --- a/terraform/nginx-proxy.tf +++ b/terraform/nginx-proxy.tf @@ -38,7 +38,8 @@ resource "docker_container" "ocwa_nginx" { depends_on = [ "local_file.proxy", "null_resource.keycloak_first_time_install", - "null_resource.minio_first_install" + "null_resource.minio_first_install", + "docker_container.ocwa_frontend" ] } From 9f66ef01aec642f1b76d297475e1c8d61933076f Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 15:42:35 -0800 Subject: [PATCH 203/226] squeezed the scans out in to the respective build area for efficiency --- .travis.yml | 819 +++++++++++++++++++++++++++------------------------- 1 file changed, 427 insertions(+), 392 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21a54c74e..e5b5960b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,396 +13,433 @@ addons: matrix: include: -# - name: "Forum Api" -# stage: "APIs" -# language: node_js -# node_js: -# - "node" -# cache: npm -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - g++-4.8 -# before_script: -# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi -# - cp config/test.json.example config/test.json -# - cp config/default.json.example config/default.json -# - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -# - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz -# - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data -# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork -# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' -# - wget -q ${HELM_URL}/${HELM_TGZ} -# - tar xzfv ${HELM_TGZ} -# - PATH=`pwd`/linux-amd64/:$PATH -# - helm init --client-only -# # Installig pip deps -# - sudo pip install yamllint=="${YAMLLINT_VERSION}" -# -# before_install: -# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi -# - npm install -# -# script: -# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi -# - npm test -# - helm lint helm/forum-api -# - bash docker_quayio_push -# -# before_deploy: -# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi -# -# deploy: -# provider: script -# script: bash docker_push -# on: -# all_branches: true -# condition: $TRAVIS_BRANCH =~ ^master|develop$ -# -# - name: "Request Api" -# stage: "APIs" -# language: node_js -# node_js: -# - "node" -# cache: npm -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - g++-4.8 -# - python3-pip -# before_script: -# - wget -q ${HELM_URL}/${HELM_TGZ} -# - tar xzfv ${HELM_TGZ} -# - PATH=`pwd`/linux-amd64/:$PATH -# - helm init --client-only -# # Installig pip deps -# - sudo pip install yamllint=="${YAMLLINT_VERSION}" -# -# script: -# - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -# - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz -# - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data -# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork -# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' -# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi -# - cp config/test.json.example config/test.json -# - cp config/default.json.example config/default.json -# - npm install -# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi -# - npm install -# - cp config/default.json.example config/default.json -# - cp config/test.json.example config/test.json -# - NODE_ENV=test npm start & -# - wget https://dl.minio.io/server/minio/release/linux-amd64/minio -# - chmod +x minio -# - export MINIO_ACCESS_KEY="myKey" -# - export MINIO_SECRET_KEY="mySecret" -# - ./minio server /tmp & -# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi -# - sudo pip3 install -U setuptools -# - sudo pip3 install -r requirements.txt -# - cp config/default.json.template config/default.json -# - sudo pip3 install -e . -# - python3 wsgi.py & -# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi -# - sudo pip3 install -U setuptools -# - sudo pip3 install -r requirements.txt -# - cp config/default.json.template config/default.json -# - sudo pip3 install -e . -# - python3 wsgi.py & -# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi -# - sleep 15 -# - npm test -# - helm lint helm/request-api -# - bash docker_quayio_push -# -# before_deploy: -# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi -# -# deploy: -# provider: script -# script: bash docker_push -# on: -# all_branches: true -# condition: $TRAVIS_BRANCH =~ ^master|develop$ -# -# - name: "Policy Api" -# stage: "APIs" -# language: python -# python: -# - "3.6" -# cache: pip -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - python3-pip -# -# install: -# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi -# - sudo pip3 install -U setuptools -# - sudo pip3 install -r requirements.txt -# -# script: -# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi -# - cp config/default.json.template config/default.json -# - sudo pip3 install -e . -# - sudo pytest -# - wget -q ${HELM_URL}/${HELM_TGZ} -# - tar xzfv ${HELM_TGZ} -# - PATH=`pwd`/linux-amd64/:$PATH -# - helm init --client-only -# # Installig pip deps -# - sudo pip install yamllint=="${YAMLLINT_VERSION}" -# - helm lint helm/policy-api -# - bash docker_quayio_push -# -# before_deploy: -# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi -# -# deploy: -# provider: script -# script: bash docker_push -# on: -# all_branches: true -# condition: $TRAVIS_BRANCH =~ ^master|develop$ -# -# - name: "Validation Api" -# stage: "APIs" -# language: python -# python: -# - "3.6" -# cache: pip -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - python3-pip -# before_script: -# - wget -q ${HELM_URL}/${HELM_TGZ} -# - tar xzfv ${HELM_TGZ} -# - PATH=`pwd`/linux-amd64/:$PATH -# - helm init --client-only -# # Installig pip deps -# - sudo pip install yamllint=="${YAMLLINT_VERSION}" -# -# before_install: -# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi -# install: -# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi -# - sudo pip3 install -U setuptools -# - sudo pip3 install -r requirements.txt -# -# script: -# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi -# - sudo pip3 install -U setuptools -# - sudo pip3 install -r requirements.txt -# - cp config/default.json.template config/default.json -# - sudo pip3 install -e . -# - python3 wsgi.py & -# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi -# - cp config/default.json.template config/default.json -# - sudo pip3 install -e . -# - sudo coverage run --branch --source=db,v1,validator -m pytest -# - helm lint helm/validate-api -# - bash docker_quayio_push -# -# before_deploy: -# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi -# -# deploy: -# provider: script -# script: bash docker_push -# on: -# all_branches: true -# condition: $TRAVIS_BRANCH =~ ^master|develop$ -# -# - name: "Front End" -# stage: "Frontend" -# language: node_js -# node_js: -# - "node" -# cache: npm -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - g++-4.8 -# -# before_script: -# - cd /home/travis/build/bcgov/OCWA/frontend -# - wget -q ${HELM_URL}/${HELM_TGZ} -# - tar xzfv ${HELM_TGZ} -# - PATH=`pwd`/linux-amd64/:$PATH -# - helm init --client-only -# # Installig pip deps -# - sudo pip install yamllint=="${YAMLLINT_VERSION}" -# before_install: -# - npm install -g yarn --cache-min 999999999 -# -# script: -# - cd /home/travis/build/bcgov/OCWA/frontend -# - cp config/test.json.example config/test.json -# - yarn -# - npm test -# - helm lint helm/ocwa-frontend -# - bash docker_quayio_push ocwa_frontend -# -# before_deploy: -# - cd /home/travis/build/bcgov/OCWA/frontend -# -# deploy: -# provider: script -# script: bash docker_push -# on: -# all_branches: true -# condition: $TRAVIS_BRANCH =~ ^master|develop$ -# -# - name: "Scan - Python" -# stage: "Tests" -# python: -# - "3.6" -# cache: pip -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - python3-pip -# before_script: -# - cd /home/travis/build/bcgov/OCWA -# - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip -# - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip -# - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH -# - sudo pip install yamllint=="${YAMLLINT_VERSION}" -# -# install: -# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi -# - sudo pip3 install -U setuptools -# - sudo pip3 install -r requirements.txt -# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi -# - sudo pip3 install -r requirements.txt -# -# script: -# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi -# - cp config/default.json.template config/default.json -# - sudo pip3 install -e . -# - sudo coverage run --branch --source=db,v1,validator -m pytest -# - sudo coverage xml -# -# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi -# - cp config/default.json.template config/default.json -# - sudo pip3 install -e . -# - sudo coverage run --branch --source=db,v1 -m pytest -# - sudo coverage xml -# -# - cd /home/travis/build/bcgov/OCWA -# - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH -# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi -# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi -# -# - name: "Scan - NodeJS" -# stage: "Tests" -# language: node_js -# node_js: -# - "node" -# cache: npm -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - g++-4.8 -# - python3-pip -# -# before_script: -# - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -# - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz -# - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data -# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork -# - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' -# -# - cd /home/travis/build/bcgov/OCWA -# - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip -# - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip -# - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH -# -# -# before_install: -# - npm install -g yarn --cache-min 999999999 -# -# script: -# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi -# - cp config/test.json.example config/test.json -# - cp config/default.json.example config/default.json -# - yarn -# -# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi -# - cp config/test.json.example config/test.json -# - cp config/default.json.example config/default.json -# - yarn -# -# - cd /home/travis/build/bcgov/OCWA/frontend -# - cp config/test.json.example config/test.json -# - yarn -# -# - cd /home/travis/build/bcgov/OCWA/microservices/forumApi -# - npm test -# -# - NODE_ENV=test npm start & -# - wget https://dl.minio.io/server/minio/release/linux-amd64/minio -# - chmod +x minio -# - export MINIO_ACCESS_KEY="myKey" -# - export MINIO_SECRET_KEY="mySecret" -# - ./minio server /tmp & -# - cd /home/travis/build/bcgov/OCWA/microservices/validateApi -# - sudo pip3 install -U setuptools -# - sudo pip3 install -r requirements.txt -# - cp config/default.json.template config/default.json -# - sudo pip3 install -e . -# - python3 wsgi.py & -# - cd /home/travis/build/bcgov/OCWA/microservices/policyApi -# - sudo pip3 install -U setuptools -# - sudo pip3 install -r requirements.txt -# - cp config/default.json.template config/default.json -# - sudo pip3 install -e . -# - python3 wsgi.py & -# - cd /home/travis/build/bcgov/OCWA/microservices/requestApi -# - sleep 15 -# - npm test -# -# - cd /home/travis/build/bcgov/OCWA/frontend -# - npm test -# -# - cd /home/travis/build/bcgov/OCWA -# - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH -# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend -# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi -# - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi -# -# - name: "OCWA Master Helm Chart" -# stage: "Tests" -# language: node_js -# node_js: -# - "node" -# cache: npm -# script: -# - cd /home/travis/build/bcgov/OCWA -# - wget -q ${HELM_URL}/${HELM_TGZ} -# - tar xzfv ${HELM_TGZ} -# - PATH=`pwd`/linux-amd64/:$PATH -# - helm init --client-only -# # Installig pip deps -# - sudo pip install yamllint=="${YAMLLINT_VERSION}" -# - cd /home/travis/build/bcgov/OCWA -# - helm lint helm/ocwa + - name: "Forum Api" + stage: "APIs" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + before_script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + - helm lint helm/forum-api + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Request Api" + stage: "APIs" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - npm install + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi + - helm lint helm/request-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Policy Api" + stage: "APIs" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + + before_script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - sudo coverage run --branch --source=db,v1 -m pytest + - sudo coverage xml + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + + - helm lint helm/policy-api + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Validation Api" + stage: "APIs" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - sudo coverage xml + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + - helm lint helm/validate-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + # - name: "Scan - Python" + # stage: "Tests" + # python: + # - "3.6" + # cache: pip + # addons: + # apt: + # sources: + # - ubuntu-toolchain-r-test + # packages: + # - python3-pip + # before_script: + # - cd /home/travis/build/bcgov/OCWA + # - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + # - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + # - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + # - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + # install: + # - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + # - sudo pip3 install -U setuptools + # - sudo pip3 install -r requirements.txt + # - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + # - sudo pip3 install -r requirements.txt + + # script: + # - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + # - cp config/default.json.template config/default.json + # - sudo pip3 install -e . + # - sudo coverage run --branch --source=db,v1,validator -m pytest + # - sudo coverage xml + + # - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + # - cp config/default.json.template config/default.json + # - sudo pip3 install -e . + # - sudo coverage run --branch --source=db,v1 -m pytest + # - sudo coverage xml + + # - cd /home/travis/build/bcgov/OCWA + # - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi + + # - name: "Scan - NodeJS" + # stage: "Tests" + # language: node_js + # node_js: + # - "node" + # cache: npm + # addons: + # apt: + # sources: + # - ubuntu-toolchain-r-test + # packages: + # - g++-4.8 + # - python3-pip + + # before_script: + # - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + # - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + # - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + # - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + # - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + + # - cd /home/travis/build/bcgov/OCWA + # - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + # - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + # - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + + # before_install: + # - npm install -g yarn --cache-min 999999999 + + # script: + # - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + # - cp config/test.json.example config/test.json + # - cp config/default.json.example config/default.json + # - yarn + + # - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + # - cp config/test.json.example config/test.json + # - cp config/default.json.example config/default.json + # - yarn + + # - cd /home/travis/build/bcgov/OCWA/frontend + # - cp config/test.json.example config/test.json + # - yarn + + # - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + # - npm test + + # - NODE_ENV=test npm start & + # - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + # - chmod +x minio + # - export MINIO_ACCESS_KEY="myKey" + # - export MINIO_SECRET_KEY="mySecret" + # - ./minio server /tmp & + # - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + # - sudo pip3 install -U setuptools + # - sudo pip3 install -r requirements.txt + # - cp config/default.json.template config/default.json + # - sudo pip3 install -e . + # - python3 wsgi.py & + # - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + # - sudo pip3 install -U setuptools + # - sudo pip3 install -r requirements.txt + # - cp config/default.json.template config/default.json + # - sudo pip3 install -e . + # - python3 wsgi.py & + # - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + # - sleep 15 + # - npm test + + # - cd /home/travis/build/bcgov/OCWA/frontend + # - npm test + + # - cd /home/travis/build/bcgov/OCWA + # - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi + # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi + + - name: "OCWA Master Helm Chart" + stage: "Tests" + language: node_js + node_js: + - "node" + cache: npm + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa - name: "Integration Tests" stage: "Tests" @@ -451,8 +488,6 @@ matrix: #RUN Integration - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" - - docker logs ocwa_frontend - - docker logs ocwa_request_api env: From 03b7618ee8000d29459fe1aa228170fa51ea4b3e Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 15:55:50 -0800 Subject: [PATCH 204/226] formatting --- .travis.yml | 586 ++++++++++++++++++++++++++-------------------------- 1 file changed, 293 insertions(+), 293 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5b5960b5..671850d9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,294 +13,294 @@ addons: matrix: include: - - name: "Forum Api" - stage: "APIs" - language: node_js - node_js: + - name: "Forum Api" + stage: "APIs" + language: node_js + node_js: - "node" - cache: npm - addons: + cache: npm + addons: apt: sources: - ubuntu-toolchain-r-test packages: - g++-4.8 - before_script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install + before_script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install - script: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm test - - helm lint helm/forum-api - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Request Api" - stage: "APIs" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + script: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm test + - helm lint helm/forum-api + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Request Api" + stage: "APIs" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - script: - - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - cp config/test.json.example config/test.json - - cp config/default.json.example config/default.json - - npm install - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - npm install - - cp config/default.json.example config/default.json - - cp config/test.json.example config/test.json - - NODE_ENV=test npm start & - - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - - chmod +x minio - - export MINIO_ACCESS_KEY="myKey" - - export MINIO_SECRET_KEY="mySecret" - - ./minio server /tmp & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - sleep 15 - - npm test - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - helm lint helm/request-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Policy Api" - stage: "APIs" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - + script: + - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz + - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz + - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork + - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - cp config/test.json.example config/test.json + - cp config/default.json.example config/default.json + - npm install + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - npm install + - cp config/default.json.example config/default.json + - cp config/test.json.example config/test.json + - NODE_ENV=test npm start & + - wget https://dl.minio.io/server/minio/release/linux-amd64/minio + - chmod +x minio + - export MINIO_ACCESS_KEY="myKey" + - export MINIO_SECRET_KEY="mySecret" + - ./minio server /tmp & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - sleep 15 + - npm test + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi + - helm lint helm/request-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Policy Api" + stage: "APIs" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: - cd /home/travis/build/bcgov/OCWA - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - install: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo pytest - - sudo coverage run --branch --source=db,v1 -m pytest - - sudo coverage xml - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + install: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo pytest + - sudo coverage run --branch --source=db,v1 -m pytest + - sudo coverage xml + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps - - helm lint helm/policy-api - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Validation Api" - stage: "APIs" - language: python - python: - - "3.6" - cache: pip - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - python3-pip - before_script: - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - before_install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - install: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - script: - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - sudo pip3 install -U setuptools - - sudo pip3 install -r requirements.txt - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - python3 wsgi.py & - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - cp config/default.json.template config/default.json - - sudo pip3 install -e . - - sudo coverage run --branch --source=db,v1,validator -m pytest - - sudo coverage xml - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - - helm lint helm/validate-api - - bash docker_quayio_push - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - - - name: "Front End" - stage: "Frontend" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ + - helm lint helm/policy-api + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Validation Api" + stage: "APIs" + language: python + python: + - "3.6" + cache: pip + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - python3-pip + before_script: + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + + before_install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + install: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + + script: + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - sudo pip3 install -U setuptools + - sudo pip3 install -r requirements.txt + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - python3 wsgi.py & + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - cp config/default.json.template config/default.json + - sudo pip3 install -e . + - sudo coverage run --branch --source=db,v1,validator -m pytest + - sudo coverage xml + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + - helm lint helm/validate-api + - bash docker_quayio_push + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ # - name: "Scan - Python" # stage: "Tests" @@ -424,22 +424,22 @@ matrix: # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - name: "OCWA Master Helm Chart" - stage: "Tests" - language: node_js - node_js: - - "node" - cache: npm - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa + - name: "OCWA Master Helm Chart" + stage: "Tests" + language: node_js + node_js: + - "node" + cache: npm + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa - name: "Integration Tests" stage: "Tests" @@ -457,14 +457,14 @@ matrix: - python3-pip packages: - g++-4.8 - - python3-pip + - python3-pip script: - cd /usr/local/bin - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip - sudo unzip -o terraform_0.11.8_linux_amd64.zip - sudo rm -rf terraform_0.11.8_linux_amd64.zip - - sudo chmod +x terraform + - sudo chmod +x terraform - cd /home/travis/build/bcgov/OCWA/terraform - mkdir _tmp @@ -484,7 +484,7 @@ matrix: - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - + #RUN Integration - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" From 1def8aeaf0df7067ef9577cab8ef0a4991462624 Mon Sep 17 00:00:00 2001 From: Joshua Date: Mon, 28 Jan 2019 15:58:52 -0800 Subject: [PATCH 205/226] Fix filter error with approved request on exporter side, hide some actions on approved and greater requests and small text changes. --- .../src/modules/app/components/app/index.jsx | 2 +- .../components/request/sidebar.jsx | 65 ++++++++++--------- .../components/requests-list/index.jsx | 2 +- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/frontend/src/modules/app/components/app/index.jsx b/frontend/src/modules/app/components/app/index.jsx index 98b31c076..045eb5fda 100644 --- a/frontend/src/modules/app/components/app/index.jsx +++ b/frontend/src/modules/app/components/app/index.jsx @@ -14,7 +14,7 @@ import * as styles from './styles.css'; const Exporter = Loadable({ loader: () => import('../../../exporter/components/app'), - loading: () => , + loading: () => , }); const OutputChecker = Loadable({ loader: () => import('../../../output-checker/components/app'), diff --git a/frontend/src/modules/output-checker/components/request/sidebar.jsx b/frontend/src/modules/output-checker/components/request/sidebar.jsx index a1ef5afd9..882e51be0 100644 --- a/frontend/src/modules/output-checker/components/request/sidebar.jsx +++ b/frontend/src/modules/output-checker/components/request/sidebar.jsx @@ -39,38 +39,39 @@ function Sidebar({ Assign to Me )} - {user.email === assignedUser && ( - -
Actions
- - - - - )} + {user.email === assignedUser && + data.state < 4 && ( + +
Actions
+ + + + + )} ); } diff --git a/frontend/src/modules/requests/components/requests-list/index.jsx b/frontend/src/modules/requests/components/requests-list/index.jsx index 57afe8d5e..827de4a4c 100644 --- a/frontend/src/modules/requests/components/requests-list/index.jsx +++ b/frontend/src/modules/requests/components/requests-list/index.jsx @@ -43,7 +43,7 @@ const filters = [ { label: 'All', filter: null }, { label: 'Draft', filter: [0, 1] }, { label: 'Queued/In Review', filter: [2, 3, 9] }, - { label: 'Flagged', filter: 4 }, + { label: 'Approved', filter: 4 }, { label: 'Denied', filter: 5 }, { label: 'Cancelled', filter: 6 }, ]; From 84da521b73dfc1459db1d231a8e9061d770d26d7 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 16:06:16 -0800 Subject: [PATCH 206/226] fixed sonar ordering --- .travis.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 671850d9a..65637540e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,10 +53,10 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - npm test - helm lint helm/forum-api + - bash docker_quayio_push - cd /home/travis/build/bcgov/OCWA - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - - bash docker_quayio_push before_deploy: - cd /home/travis/build/bcgov/OCWA/microservices/forumApi @@ -128,11 +128,12 @@ matrix: - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - sleep 15 - npm test + - bash docker_quayio_push - cd /home/travis/build/bcgov/OCWA - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - helm lint helm/request-api - - bash docker_quayio_push + before_deploy: - cd /home/travis/build/bcgov/OCWA/microservices/requestApi @@ -183,8 +184,10 @@ matrix: # Installig pip deps - helm lint helm/policy-api - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - bash docker_quayio_push + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi before_deploy: - cd /home/travis/build/bcgov/OCWA/microservices/policyApi @@ -239,9 +242,12 @@ matrix: - sudo pip3 install -e . - sudo coverage run --branch --source=db,v1,validator -m pytest - sudo coverage xml - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - helm lint helm/validate-api - bash docker_quayio_push + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi + before_deploy: - cd /home/travis/build/bcgov/OCWA/microservices/validateApi @@ -286,11 +292,11 @@ matrix: - cp config/test.json.example config/test.json - yarn - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend - cd /home/travis/build/bcgov/OCWA - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend before_deploy: - cd /home/travis/build/bcgov/OCWA/frontend From 4a8f15ac4023a8d3f347711ad781b80b6b7c59a5 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 16:08:54 -0800 Subject: [PATCH 207/226] put frontend build after tests --- .travis.yml | 98 ++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65637540e..199ac438d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -259,55 +259,6 @@ matrix: all_branches: true condition: $TRAVIS_BRANCH =~ ^master|develop$ - - name: "Front End" - stage: "Frontend" - language: node_js - node_js: - - "node" - cache: npm - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - before_script: - - cd /home/travis/build/bcgov/OCWA/frontend - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - before_install: - - npm install -g yarn --cache-min 999999999 - - script: - - cd /home/travis/build/bcgov/OCWA/frontend - - cp config/test.json.example config/test.json - - yarn - - npm test - - helm lint helm/ocwa-frontend - - bash docker_quayio_push ocwa_frontend - - cd /home/travis/build/bcgov/OCWA - - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - - before_deploy: - - cd /home/travis/build/bcgov/OCWA/frontend - - deploy: - provider: script - script: bash docker_push - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ - # - name: "Scan - Python" # stage: "Tests" # python: @@ -495,6 +446,55 @@ matrix: - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" + - name: "Front End" + stage: "Frontend" + language: node_js + node_js: + - "node" + cache: npm + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + + before_script: + - cd /home/travis/build/bcgov/OCWA/frontend + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip + - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + before_install: + - npm install -g yarn --cache-min 999999999 + + script: + - cd /home/travis/build/bcgov/OCWA/frontend + - cp config/test.json.example config/test.json + - yarn + - npm test + - helm lint helm/ocwa-frontend + - bash docker_quayio_push ocwa_frontend + - cd /home/travis/build/bcgov/OCWA + - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH + - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend + + before_deploy: + - cd /home/travis/build/bcgov/OCWA/frontend + + deploy: + provider: script + script: bash docker_push + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^master|develop$ + env: global: From e3d08626f26418d645c1f40dbe42d32c6f6d1fda Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Mon, 28 Jan 2019 16:11:00 -0800 Subject: [PATCH 208/226] put tests before components as they build images --- .travis.yml | 252 ++++++++++++++-------------------------------------- 1 file changed, 65 insertions(+), 187 deletions(-) diff --git a/.travis.yml b/.travis.yml index 199ac438d..413bfc452 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,71 @@ addons: matrix: include: + - name: "Integration Tests" + stage: "Tests" + language: node_js + node_js: + - "node" + addons: + chrome: stable + hosts: + - auth.example.demo + - ocwa.example.demo + apt: + sources: + - ubuntu-toolchain-r-test + - python3-pip + packages: + - g++-4.8 + - python3-pip + + script: + - cd /usr/local/bin + - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip + - sudo unzip -o terraform_0.11.8_linux_amd64.zip + - sudo rm -rf terraform_0.11.8_linux_amd64.zip + - sudo chmod +x terraform + + - cd /home/travis/build/bcgov/OCWA/terraform + - mkdir _tmp + - cp terraform.tfvars.example terraform.tfvars + - terraform init + - terraform plan -var hostRootPath=`pwd`/_tmp + - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve + - sleep 30 + - docker ps + + #Katalon requires OpenJDK 8 installed separately + - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk + + #Install Katalon Studios + - cd /usr/local/bin + - sudo wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} + + #RUN Integration + - cd Katalon_Studio_Linux_64-${KATALON_VERSION} + - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" + + - name: "OCWA Master Helm Chart" + stage: "Tests" + language: node_js + node_js: + - "node" + cache: npm + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa + - name: "Forum Api" stage: "APIs" language: node_js @@ -259,193 +324,6 @@ matrix: all_branches: true condition: $TRAVIS_BRANCH =~ ^master|develop$ - # - name: "Scan - Python" - # stage: "Tests" - # python: - # - "3.6" - # cache: pip - # addons: - # apt: - # sources: - # - ubuntu-toolchain-r-test - # packages: - # - python3-pip - # before_script: - # - cd /home/travis/build/bcgov/OCWA - # - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - # - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - # - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - # - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - # install: - # - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - # - sudo pip3 install -U setuptools - # - sudo pip3 install -r requirements.txt - # - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - # - sudo pip3 install -r requirements.txt - - # script: - # - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - # - cp config/default.json.template config/default.json - # - sudo pip3 install -e . - # - sudo coverage run --branch --source=db,v1,validator -m pytest - # - sudo coverage xml - - # - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - # - cp config/default.json.template config/default.json - # - sudo pip3 install -e . - # - sudo coverage run --branch --source=db,v1 -m pytest - # - sudo coverage xml - - # - cd /home/travis/build/bcgov/OCWA - # - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_validate_api -Dsonar.projectName="OCWA Validate API" -Dsonar.modules=validateApi - # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_policy_api -Dsonar.projectName="OCWA Policy API" -Dsonar.modules=policyApi - - # - name: "Scan - NodeJS" - # stage: "Tests" - # language: node_js - # node_js: - # - "node" - # cache: npm - # addons: - # apt: - # sources: - # - ubuntu-toolchain-r-test - # packages: - # - g++-4.8 - # - python3-pip - - # before_script: - # - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz - # - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz - # - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data - # - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork - # - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongo forumDb --eval 'db.createUser({user:"forumUser", pwd:"forumPass", roles:["readWrite"]});' - - # - cd /home/travis/build/bcgov/OCWA - # - wget -q ${SONAR_URL}${SONAR_APP}-cli-${SONAR_VERSION}.zip - # - unzip ${SONAR_APP}-cli-${SONAR_VERSION}.zip - # - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - - - # before_install: - # - npm install -g yarn --cache-min 999999999 - - # script: - # - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - # - cp config/test.json.example config/test.json - # - cp config/default.json.example config/default.json - # - yarn - - # - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - # - cp config/test.json.example config/test.json - # - cp config/default.json.example config/default.json - # - yarn - - # - cd /home/travis/build/bcgov/OCWA/frontend - # - cp config/test.json.example config/test.json - # - yarn - - # - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - # - npm test - - # - NODE_ENV=test npm start & - # - wget https://dl.minio.io/server/minio/release/linux-amd64/minio - # - chmod +x minio - # - export MINIO_ACCESS_KEY="myKey" - # - export MINIO_SECRET_KEY="mySecret" - # - ./minio server /tmp & - # - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - # - sudo pip3 install -U setuptools - # - sudo pip3 install -r requirements.txt - # - cp config/default.json.template config/default.json - # - sudo pip3 install -e . - # - python3 wsgi.py & - # - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - # - sudo pip3 install -U setuptools - # - sudo pip3 install -r requirements.txt - # - cp config/default.json.template config/default.json - # - sudo pip3 install -e . - # - python3 wsgi.py & - # - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - # - sleep 15 - # - npm test - - # - cd /home/travis/build/bcgov/OCWA/frontend - # - npm test - - # - cd /home/travis/build/bcgov/OCWA - # - PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH - # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend - # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_forum_api -Dsonar.projectName="OCWA Forum API" -Dsonar.modules=forumApi - # - sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_request_api -Dsonar.projectName="OCWA Request API" -Dsonar.modules=requestApi - - - name: "OCWA Master Helm Chart" - stage: "Tests" - language: node_js - node_js: - - "node" - cache: npm - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa - - - name: "Integration Tests" - stage: "Tests" - language: node_js - node_js: - - "node" - addons: - chrome: stable - hosts: - - auth.example.demo - - ocwa.example.demo - apt: - sources: - - ubuntu-toolchain-r-test - - python3-pip - packages: - - g++-4.8 - - python3-pip - - script: - - cd /usr/local/bin - - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip - - sudo unzip -o terraform_0.11.8_linux_amd64.zip - - sudo rm -rf terraform_0.11.8_linux_amd64.zip - - sudo chmod +x terraform - - - cd /home/travis/build/bcgov/OCWA/terraform - - mkdir _tmp - - cp terraform.tfvars.example terraform.tfvars - - terraform init - - terraform plan -var hostRootPath=`pwd`/_tmp - - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve - - sleep 30 - - docker ps - - #Katalon requires OpenJDK 8 installed separately - - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk - - #Install Katalon Studios - - cd /usr/local/bin - - sudo wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - - #RUN Integration - - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" - - name: "Front End" stage: "Frontend" language: node_js From 846a9c8592a4ed2c8988bcbff524115efc0aa8f5 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Mon, 28 Jan 2019 16:30:19 -0800 Subject: [PATCH 209/226] Update networking to have a fixed ip for nginx to fix frontend issue with finding keycloak --- terraform/network.tf | 4 ++++ terraform/nginx-proxy.tf | 5 ++++- terraform/ocwa_frontend.tf | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/terraform/network.tf b/terraform/network.tf index 2a9a7bd64..92a1551f2 100644 --- a/terraform/network.tf +++ b/terraform/network.tf @@ -1,3 +1,7 @@ resource "docker_network" "private_network" { name = "ocwa_vnet" + ipam_config = { + ip_range = "4.4.5.0/24" + subnet = "4.4.0.0/16" + } } diff --git a/terraform/nginx-proxy.tf b/terraform/nginx-proxy.tf index 60e905908..37a69ab64 100644 --- a/terraform/nginx-proxy.tf +++ b/terraform/nginx-proxy.tf @@ -18,7 +18,10 @@ resource "docker_container" "ocwa_nginx" { internal = 443 external = 443 }] - networks_advanced = { name = "${docker_network.private_network.name}" } + networks_advanced = { + name = "${docker_network.private_network.name}" + ipv4_address = "4.4.4.4" + } volumes = [{ host_path = "${var.hostRootPath}/ssl" container_path = "/ssl" diff --git a/terraform/ocwa_frontend.tf b/terraform/ocwa_frontend.tf index 7f7b6e90b..136f4f809 100644 --- a/terraform/ocwa_frontend.tf +++ b/terraform/ocwa_frontend.tf @@ -20,7 +20,7 @@ resource "docker_container" "ocwa_frontend" { host = [ { host = "${var.authHostname}" - ip = "${docker_container.ocwa_nginx.ip_address}" + ip = "4.4.4.4" } ] From ab93855b6b20c3bc2961848512c92998319631b0 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Mon, 28 Jan 2019 16:31:14 -0800 Subject: [PATCH 210/226] Update networking to have a fixed ip for nginx to fix frontend issue with finding keycloak --- terraform/ocwa_frontend.tf | 3 --- 1 file changed, 3 deletions(-) diff --git a/terraform/ocwa_frontend.tf b/terraform/ocwa_frontend.tf index 136f4f809..7c3e3c991 100644 --- a/terraform/ocwa_frontend.tf +++ b/terraform/ocwa_frontend.tf @@ -51,7 +51,4 @@ resource "docker_container" "ocwa_frontend" { "NODE_TLS_REJECT_UNAUTHORIZED=0" ] - depends_on = [ - "docker_container.ocwa_nginx" - ] } From c04ba6b6d252c40dfcf107663a20664c4160a0ef Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Mon, 28 Jan 2019 17:01:32 -0800 Subject: [PATCH 211/226] keep locally to have a cleaner terraform destroy --- terraform/mongodb.tf | 1 + terraform/postgres.tf | 1 + 2 files changed, 2 insertions(+) diff --git a/terraform/mongodb.tf b/terraform/mongodb.tf index c82fed9c1..0aa781b9d 100644 --- a/terraform/mongodb.tf +++ b/terraform/mongodb.tf @@ -5,6 +5,7 @@ data "docker_registry_image" "mongodb" { resource "docker_image" "mongodb" { name = "${data.docker_registry_image.mongodb.name}" pull_triggers = ["${data.docker_registry_image.mongodb.sha256_digest}"] + keep_locally = true } resource "docker_container" "ocwa_mongodb" { diff --git a/terraform/postgres.tf b/terraform/postgres.tf index e69f51eaf..e03acfef2 100644 --- a/terraform/postgres.tf +++ b/terraform/postgres.tf @@ -5,6 +5,7 @@ data "docker_registry_image" "postgres" { resource "docker_image" "postgres" { name = "${data.docker_registry_image.postgres.name}" pull_triggers = ["${data.docker_registry_image.postgres.sha256_digest}"] + keep_locally = true } resource "docker_container" "ocwa_postgres" { From 38942b9dccb87f470445a46e8eb81831e2ca8061 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Mon, 28 Jan 2019 20:18:46 -0800 Subject: [PATCH 212/226] Upgrade keyclose to version 4.8.3.Final --- terraform/keycloak.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/terraform/keycloak.tf b/terraform/keycloak.tf index 0241e868f..d347f4b1c 100644 --- a/terraform/keycloak.tf +++ b/terraform/keycloak.tf @@ -1,10 +1,11 @@ data "docker_registry_image" "keycloak" { - name = "jboss/keycloak:4.1.0.Final" + name = "jboss/keycloak:4.8.3.Final" } resource "docker_image" "keycloak" { name = "${data.docker_registry_image.keycloak.name}" pull_triggers = ["${data.docker_registry_image.keycloak.sha256_digest}"] + keep_locally = true } resource "docker_container" "ocwa_keycloak" { From 87032979904f6838672a4acf205d4eef155a26c0 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Mon, 28 Jan 2019 20:20:15 -0800 Subject: [PATCH 213/226] Network changes to have a clean deployment --- terraform/network.tf | 8 ++++---- terraform/nginx-proxy.tf | 5 ++--- terraform/ocwa_frontend.tf | 3 ++- terraform/scripts/nginx-proxy.tpl | 5 ++++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/terraform/network.tf b/terraform/network.tf index 92a1551f2..393c0759d 100644 --- a/terraform/network.tf +++ b/terraform/network.tf @@ -1,7 +1,7 @@ resource "docker_network" "private_network" { name = "ocwa_vnet" - ipam_config = { - ip_range = "4.4.5.0/24" - subnet = "4.4.0.0/16" - } +# ipam_config = { +# gateway = "4.4.0.1" +# subnet = "4.4.0.0/16" +# } } diff --git a/terraform/nginx-proxy.tf b/terraform/nginx-proxy.tf index 37a69ab64..51d4e5269 100644 --- a/terraform/nginx-proxy.tf +++ b/terraform/nginx-proxy.tf @@ -20,7 +20,7 @@ resource "docker_container" "ocwa_nginx" { }] networks_advanced = { name = "${docker_network.private_network.name}" - ipv4_address = "4.4.4.4" +# ipv4_address = "4.4.4.4" } volumes = [{ host_path = "${var.hostRootPath}/ssl" @@ -41,8 +41,7 @@ resource "docker_container" "ocwa_nginx" { depends_on = [ "local_file.proxy", "null_resource.keycloak_first_time_install", - "null_resource.minio_first_install", - "docker_container.ocwa_frontend" + "null_resource.minio_first_install" ] } diff --git a/terraform/ocwa_frontend.tf b/terraform/ocwa_frontend.tf index 7c3e3c991..e9caf8d9d 100644 --- a/terraform/ocwa_frontend.tf +++ b/terraform/ocwa_frontend.tf @@ -17,10 +17,11 @@ resource "docker_container" "ocwa_frontend" { internal = 8000 external = 8000 } + host = [ { host = "${var.authHostname}" - ip = "4.4.4.4" + ip = "${docker_container.ocwa_nginx.ip_address}" } ] diff --git a/terraform/scripts/nginx-proxy.tpl b/terraform/scripts/nginx-proxy.tpl index 26d3741e0..c30562f28 100644 --- a/terraform/scripts/nginx-proxy.tpl +++ b/terraform/scripts/nginx-proxy.tpl @@ -92,6 +92,7 @@ server { # Proxy everything else to the frontend location / { resolver 127.0.0.11 valid=30s; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -100,7 +101,9 @@ server { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; - proxy_pass http://ocwa_frontend:8000; + set $backend "http://ocwa_frontend:8000"; + + proxy_pass $backend; } } From 791ef99303b199aeec52671dce0e145067c24a00 Mon Sep 17 00:00:00 2001 From: ikethecoder Date: Mon, 28 Jan 2019 20:22:07 -0800 Subject: [PATCH 214/226] remove commented config --- terraform/network.tf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/terraform/network.tf b/terraform/network.tf index 393c0759d..2a9a7bd64 100644 --- a/terraform/network.tf +++ b/terraform/network.tf @@ -1,7 +1,3 @@ resource "docker_network" "private_network" { name = "ocwa_vnet" -# ipam_config = { -# gateway = "4.4.0.1" -# subnet = "4.4.0.0/16" -# } } From 95eb685647250e7746d09c184dd90303881feb2a Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 29 Jan 2019 08:50:11 -0800 Subject: [PATCH 215/226] docker logs again --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 413bfc452..39cf6521c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,8 @@ matrix: #RUN Integration - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" + - docker logs ocwa_frontend + - docker logs ocwa_request_api - name: "OCWA Master Helm Chart" stage: "Tests" From bf27f3b110f4b6142bae9ac0af784d65e914fb3d Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Tue, 29 Jan 2019 09:10:45 -0800 Subject: [PATCH 216/226] removed docker logs --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39cf6521c..413bfc452 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,8 +60,6 @@ matrix: #RUN Integration - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" - - docker logs ocwa_frontend - - docker logs ocwa_request_api - name: "OCWA Master Helm Chart" stage: "Tests" From 636ac5057ed00173a89ed626bbfe4dcc77f83b9e Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Wed, 30 Jan 2019 08:56:48 -0800 Subject: [PATCH 217/226] integration testing builds it's own images --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 413bfc452..380f0e846 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,16 @@ matrix: - sudo rm -rf terraform_0.11.8_linux_amd64.zip - sudo chmod +x terraform + #Build images to not go to the repo + - cd /home/travis/build/bcgov/OCWA/microservices/forumApi + - docker build -t bcgovimages/ocwa_forum_api:edge . + - cd /home/travis/build/bcgov/OCWA/microservices/policyApi + - docker build -t bcgovimages/ocwa_policy_api:edge . + - cd /home/travis/build/bcgov/OCWA/microservices/requestApi + - docker build -t bcgovimages/ocwa_request_api:edge . + - cd /home/travis/build/bcgov/OCWA/microservices/validateApi + - docker build -t bcgovimages/ocwa_validate_api:edge . + - cd /home/travis/build/bcgov/OCWA/terraform - mkdir _tmp - cp terraform.tfvars.example terraform.tfvars From 5207cdd1b7d9713d8b7f032063f0bcd2e508330a Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Wed, 30 Jan 2019 11:41:24 -0800 Subject: [PATCH 218/226] tweaked integration stage to use tst images --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 380f0e846..ae0d39688 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,17 +40,17 @@ matrix: #Build images to not go to the repo - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - docker build -t bcgovimages/ocwa_forum_api:edge . + - docker build -t bcgovimages/ocwa_forum_api:tst . - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - docker build -t bcgovimages/ocwa_policy_api:edge . + - docker build -t bcgovimages/ocwa_policy_api:tst . - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - docker build -t bcgovimages/ocwa_request_api:edge . + - docker build -t bcgovimages/ocwa_request_api:tst . - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - docker build -t bcgovimages/ocwa_validate_api:edge . + - docker build -t bcgovimages/ocwa_validate_api:tst . - cd /home/travis/build/bcgov/OCWA/terraform - mkdir _tmp - - cp terraform.tfvars.example terraform.tfvars + - cp terraform.tfvars.tst terraform.tfvars - terraform init - terraform plan -var hostRootPath=`pwd`/_tmp - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve From d590c699b9f8276831f05d7b3b680ebf11a0ec92 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Wed, 30 Jan 2019 11:58:03 -0800 Subject: [PATCH 219/226] missing tst config --- terraform/terraform.tfvars.tst | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 terraform/terraform.tfvars.tst diff --git a/terraform/terraform.tfvars.tst b/terraform/terraform.tfvars.tst new file mode 100644 index 000000000..654eae082 --- /dev/null +++ b/terraform/terraform.tfvars.tst @@ -0,0 +1,33 @@ + +mongodb = { + username = "appuser" +} + +postgres = { + username = "kcuser" +} + +keycloak = { + username = "kcadmin" +} + +ocwaHostname = "ocwa.example.demo" +ocwaHost = "https://ocwa.example.demo" + +ocwaWebSocketHost = "wss://ocwa.example.demo/socket" + +authHostname = "auth.example.demo" +authHost = "https://auth.example.demo" + +sslCertificate = "/ssl/example.crt" +sslCertificateKey = "/ssl/example.key" + +images = { + request_api = ":tst" + validate_api = ":tst" + forum_api = ":tst" + policy_api = ":tst" + frontend = ":tst" + minio = ":latest" + tusd = ":latest" +} From 179624ae250302139c39858e29f9e86a366db397 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Wed, 30 Jan 2019 13:10:34 -0800 Subject: [PATCH 220/226] reverted to having int after unit --- .travis.yml | 140 +++++++++++++++------------------ terraform/terraform.tfvars.tst | 33 -------- 2 files changed, 65 insertions(+), 108 deletions(-) delete mode 100644 terraform/terraform.tfvars.tst diff --git a/.travis.yml b/.travis.yml index ae0d39688..dabc5a050 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,81 +13,6 @@ addons: matrix: include: - - name: "Integration Tests" - stage: "Tests" - language: node_js - node_js: - - "node" - addons: - chrome: stable - hosts: - - auth.example.demo - - ocwa.example.demo - apt: - sources: - - ubuntu-toolchain-r-test - - python3-pip - packages: - - g++-4.8 - - python3-pip - - script: - - cd /usr/local/bin - - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip - - sudo unzip -o terraform_0.11.8_linux_amd64.zip - - sudo rm -rf terraform_0.11.8_linux_amd64.zip - - sudo chmod +x terraform - - #Build images to not go to the repo - - cd /home/travis/build/bcgov/OCWA/microservices/forumApi - - docker build -t bcgovimages/ocwa_forum_api:tst . - - cd /home/travis/build/bcgov/OCWA/microservices/policyApi - - docker build -t bcgovimages/ocwa_policy_api:tst . - - cd /home/travis/build/bcgov/OCWA/microservices/requestApi - - docker build -t bcgovimages/ocwa_request_api:tst . - - cd /home/travis/build/bcgov/OCWA/microservices/validateApi - - docker build -t bcgovimages/ocwa_validate_api:tst . - - - cd /home/travis/build/bcgov/OCWA/terraform - - mkdir _tmp - - cp terraform.tfvars.tst terraform.tfvars - - terraform init - - terraform plan -var hostRootPath=`pwd`/_tmp - - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve - - sleep 30 - - docker ps - - #Katalon requires OpenJDK 8 installed separately - - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk - - #Install Katalon Studios - - cd /usr/local/bin - - sudo wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz - - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon - - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} - - #RUN Integration - - cd Katalon_Studio_Linux_64-${KATALON_VERSION} - - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" - - - name: "OCWA Master Helm Chart" - stage: "Tests" - language: node_js - node_js: - - "node" - cache: npm - script: - - cd /home/travis/build/bcgov/OCWA - - wget -q ${HELM_URL}/${HELM_TGZ} - - tar xzfv ${HELM_TGZ} - - PATH=`pwd`/linux-amd64/:$PATH - - helm init --client-only - # Installig pip deps - - sudo pip install yamllint=="${YAMLLINT_VERSION}" - - cd /home/travis/build/bcgov/OCWA - - helm lint helm/ocwa - - name: "Forum Api" stage: "APIs" language: node_js @@ -383,6 +308,71 @@ matrix: all_branches: true condition: $TRAVIS_BRANCH =~ ^master|develop$ + - name: "Integration Tests" + stage: "Tests" + language: node_js + node_js: + - "node" + addons: + chrome: stable + hosts: + - auth.example.demo + - ocwa.example.demo + apt: + sources: + - ubuntu-toolchain-r-test + - python3-pip + packages: + - g++-4.8 + - python3-pip + + script: + - cd /usr/local/bin + - sudo curl -L -O https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_amd64.zip + - sudo unzip -o terraform_0.11.8_linux_amd64.zip + - sudo rm -rf terraform_0.11.8_linux_amd64.zip + - sudo chmod +x terraform + + - cd /home/travis/build/bcgov/OCWA/terraform + - mkdir _tmp + - cp terraform.tfvars.example terraform.tfvars + - terraform init + - terraform plan -var hostRootPath=`pwd`/_tmp + - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve + - sleep 30 + - docker ps + + #Katalon requires OpenJDK 8 installed separately + - sudo apt-get install -y openjdk-8-jre openjdk-8-jdk + + #Install Katalon Studios + - cd /usr/local/bin + - sudo wget --quiet https://github.com/katalon-studio/katalon-studio/releases/download/v${KATALON_VERSION}/Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - sudo tar -xf Katalon_Studio_Linux_64-${KATALON_VERSION}.tar.gz + - sudo chmod ugo+x Katalon_Studio_Linux_64-${KATALON_VERSION}/katalon + - sudo chmod -R 777 Katalon_Studio_Linux_64-${KATALON_VERSION} + + #RUN Integration + - cd Katalon_Studio_Linux_64-${KATALON_VERSION} + - xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/CucumberSuite" -executionProfile="Travis" -browserType="Chrome (headless)" + + - name: "OCWA Master Helm Chart" + stage: "Tests" + language: node_js + node_js: + - "node" + cache: npm + script: + - cd /home/travis/build/bcgov/OCWA + - wget -q ${HELM_URL}/${HELM_TGZ} + - tar xzfv ${HELM_TGZ} + - PATH=`pwd`/linux-amd64/:$PATH + - helm init --client-only + # Installig pip deps + - sudo pip install yamllint=="${YAMLLINT_VERSION}" + - cd /home/travis/build/bcgov/OCWA + - helm lint helm/ocwa + env: global: diff --git a/terraform/terraform.tfvars.tst b/terraform/terraform.tfvars.tst deleted file mode 100644 index 654eae082..000000000 --- a/terraform/terraform.tfvars.tst +++ /dev/null @@ -1,33 +0,0 @@ - -mongodb = { - username = "appuser" -} - -postgres = { - username = "kcuser" -} - -keycloak = { - username = "kcadmin" -} - -ocwaHostname = "ocwa.example.demo" -ocwaHost = "https://ocwa.example.demo" - -ocwaWebSocketHost = "wss://ocwa.example.demo/socket" - -authHostname = "auth.example.demo" -authHost = "https://auth.example.demo" - -sslCertificate = "/ssl/example.crt" -sslCertificateKey = "/ssl/example.key" - -images = { - request_api = ":tst" - validate_api = ":tst" - forum_api = ":tst" - policy_api = ":tst" - frontend = ":tst" - minio = ":latest" - tusd = ":latest" -} From 4cf10846fc94a5d880e69bce215a6c5d27264919 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Wed, 30 Jan 2019 16:05:26 -0800 Subject: [PATCH 221/226] version endpoint --- frontend/docker_push | 1 + microservices/forumApi/app.js | 17 +++++++++++++++++ microservices/forumApi/docker_push | 2 ++ microservices/policyApi/app.py | 26 ++++++++++++++++++++++++++ microservices/policyApi/docker_push | 1 + microservices/requestApi/app.js | 17 +++++++++++++++++ microservices/requestApi/docker_push | 1 + microservices/validateApi/app.py | 25 +++++++++++++++++++++++++ microservices/validateApi/docker_push | 1 + 9 files changed, 91 insertions(+) diff --git a/frontend/docker_push b/frontend/docker_push index bdf342b42..8fcf99f44 100644 --- a/frontend/docker_push +++ b/frontend/docker_push @@ -6,6 +6,7 @@ cd /home/travis/build/bcgov/OCWA/frontend echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; +echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then docker build -t bcgovimages/ocwa_frontend:latest -t bcgovimages/ocwa_frontend:$TRAVIS_COMMIT .; diff --git a/microservices/forumApi/app.js b/microservices/forumApi/app.js index f19f9b2c8..6a914afe3 100644 --- a/microservices/forumApi/app.js +++ b/microservices/forumApi/app.js @@ -9,6 +9,23 @@ var config = require('config'); var db = require('./db/db').init(); var v1Router = require('./routes/v1/v1'); +app.get("/version", function(req, res){ + var hash = (process.env.GITHASH) ? process.env.GITHASH : ""; + var pjson = require('./package.json'); + var v = pjson.version; + + var version = v + if (hash !== ""){ + version += "-"+hash + } + + res.json({ + v: v, + hash: hash, + version: version + }) +}); + var websockets = require('./websocket'); var wss = websockets.init(); diff --git a/microservices/forumApi/docker_push b/microservices/forumApi/docker_push index 27a776e59..52ebfff3b 100644 --- a/microservices/forumApi/docker_push +++ b/microservices/forumApi/docker_push @@ -6,6 +6,8 @@ cd /home/travis/build/bcgov/OCWA/microservices/forumApi echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; +echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile +cat Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then docker build -t bcgovimages/ocwa_forum_api:latest -t bcgovimages/ocwa_forum_api:$TRAVIS_COMMIT . diff --git a/microservices/policyApi/app.py b/microservices/policyApi/app.py index dcb558d60..8820f6c43 100644 --- a/microservices/policyApi/app.py +++ b/microservices/policyApi/app.py @@ -72,5 +72,31 @@ def index(): :return: JSON of valid API version endpoints """ return jsonify([url_for(".v1.status", _external=True)]) + + + @app.route('/version', methods=['GET'], strict_slashes=False) + def version(): + """ + Get the current version of the api + """ + from os import environ + hash = "" + if environ.get('GITHASH') is not None: + hash = environ.get("GITHASH") + + + import pkg_resources # part of setuptools + v = pkg_resources.require("policy")[0].version + + version = v + if hash != "": + version += "-"+hash + + responseObj = { + "v": v, + "hash": hash, + "version": version + } + return jsonify(responseObj) return app diff --git a/microservices/policyApi/docker_push b/microservices/policyApi/docker_push index f99f29604..0dac7b558 100644 --- a/microservices/policyApi/docker_push +++ b/microservices/policyApi/docker_push @@ -6,6 +6,7 @@ cd /home/travis/build/bcgov/OCWA/microservices/policyApi echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; +echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then docker build -t bcgovimages/ocwa_policy_api:latest -t bcgovimages/ocwa_policy_api:$TRAVIS_COMMIT .; diff --git a/microservices/requestApi/app.js b/microservices/requestApi/app.js index 85b53babd..31c1f927b 100644 --- a/microservices/requestApi/app.js +++ b/microservices/requestApi/app.js @@ -9,6 +9,23 @@ var config = require('config'); var db = require('./db/db').init(); var v1Router = require('./routes/v1/v1'); +app.get("/version", function(req, res){ + var hash = (process.env.GITHASH) ? process.env.GITHASH : ""; + var pjson = require('./package.json'); + var v = pjson.version; + + var version = v + if (hash !== ""){ + version += "-"+hash + } + + res.json({ + v: v, + hash: hash, + version: version + }) +}); + log.level = config.get('logLevel'); log.addLevel('debug', 2900, { fg: 'green' }); diff --git a/microservices/requestApi/docker_push b/microservices/requestApi/docker_push index 93dd3146f..851be7c0d 100644 --- a/microservices/requestApi/docker_push +++ b/microservices/requestApi/docker_push @@ -6,6 +6,7 @@ cd /home/travis/build/bcgov/OCWA/microservices/requestApi echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; +echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then docker build -t bcgovimages/ocwa_request_api:latest -t bcgovimages/ocwa_request_api:$TRAVIS_COMMIT . diff --git a/microservices/validateApi/app.py b/microservices/validateApi/app.py index ad7149aa9..958f9bc98 100644 --- a/microservices/validateApi/app.py +++ b/microservices/validateApi/app.py @@ -75,4 +75,29 @@ def index(): """ return jsonify([url_for(".v1.status", _external=True)]) + @app.route('/version', methods=['GET'], strict_slashes=False) + def version(): + """ + Get the current version of the api + """ + from os import environ + hash = "" + if environ.get('GITHASH') is not None: + hash = environ.get("GITHASH") + + + import pkg_resources # part of setuptools + v = pkg_resources.require("policy")[0].version + + version = v + if hash != "": + version += "-"+hash + + responseObj = { + "v": v, + "hash": hash, + "version": version + } + return jsonify(responseObj) + return app diff --git a/microservices/validateApi/docker_push b/microservices/validateApi/docker_push index 31b82e61a..fae2bc649 100644 --- a/microservices/validateApi/docker_push +++ b/microservices/validateApi/docker_push @@ -6,6 +6,7 @@ cd /home/travis/build/bcgov/OCWA/microservices/validateApi echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; +echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then docker build -t bcgovimages/ocwa_validate_api:latest -t bcgovimages/ocwa_validate_api:$TRAVIS_COMMIT . From 56898b13071aa7f97c60681ab9aadeae7fe68aeb Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Wed, 30 Jan 2019 16:15:11 -0800 Subject: [PATCH 222/226] tweaked env modification --- frontend/docker_push | 2 +- microservices/forumApi/docker_push | 2 +- microservices/policyApi/docker_push | 2 +- microservices/requestApi/docker_push | 2 +- microservices/validateApi/docker_push | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/docker_push b/frontend/docker_push index 8fcf99f44..d97822e57 100644 --- a/frontend/docker_push +++ b/frontend/docker_push @@ -6,7 +6,7 @@ cd /home/travis/build/bcgov/OCWA/frontend echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; -echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile +printf "\nENV GITHASH $TRAVIS_COMMIT\n" >> Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then docker build -t bcgovimages/ocwa_frontend:latest -t bcgovimages/ocwa_frontend:$TRAVIS_COMMIT .; diff --git a/microservices/forumApi/docker_push b/microservices/forumApi/docker_push index 52ebfff3b..802db0747 100644 --- a/microservices/forumApi/docker_push +++ b/microservices/forumApi/docker_push @@ -6,7 +6,7 @@ cd /home/travis/build/bcgov/OCWA/microservices/forumApi echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; -echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile +printf "\nENV GITHASH $TRAVIS_COMMIT\n" >> Dockerfile cat Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then diff --git a/microservices/policyApi/docker_push b/microservices/policyApi/docker_push index 0dac7b558..760f2aa13 100644 --- a/microservices/policyApi/docker_push +++ b/microservices/policyApi/docker_push @@ -6,7 +6,7 @@ cd /home/travis/build/bcgov/OCWA/microservices/policyApi echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; -echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile +printf "\nENV GITHASH $TRAVIS_COMMIT\n" >> Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then docker build -t bcgovimages/ocwa_policy_api:latest -t bcgovimages/ocwa_policy_api:$TRAVIS_COMMIT .; diff --git a/microservices/requestApi/docker_push b/microservices/requestApi/docker_push index 851be7c0d..a197f4af3 100644 --- a/microservices/requestApi/docker_push +++ b/microservices/requestApi/docker_push @@ -6,7 +6,7 @@ cd /home/travis/build/bcgov/OCWA/microservices/requestApi echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; -echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile +printf "\nENV GITHASH $TRAVIS_COMMIT\n" >> Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then docker build -t bcgovimages/ocwa_request_api:latest -t bcgovimages/ocwa_request_api:$TRAVIS_COMMIT . diff --git a/microservices/validateApi/docker_push b/microservices/validateApi/docker_push index fae2bc649..2c386eccf 100644 --- a/microservices/validateApi/docker_push +++ b/microservices/validateApi/docker_push @@ -6,7 +6,7 @@ cd /home/travis/build/bcgov/OCWA/microservices/validateApi echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "logged in, building now"; -echo "ENV GITHASH $TRAVIS_COMMIT" >> Dockerfile +printf "\nENV GITHASH $TRAVIS_COMMIT\n" >> Dockerfile if [ $TRAVIS_BRANCH == "master" ]; then docker build -t bcgovimages/ocwa_validate_api:latest -t bcgovimages/ocwa_validate_api:$TRAVIS_COMMIT . From 8cc10f35b9bc8f7d20e3716b7b96134783477a63 Mon Sep 17 00:00:00 2001 From: Jeremy Ho Date: Wed, 30 Jan 2019 16:49:36 -0800 Subject: [PATCH 223/226] Add cross-env for Windows and Unix compatibility Force text diffed files to have lf file endings in git Signed-off-by: Jeremy Ho --- .gitattributes | 1 + frontend/package.json | 7 ++++--- frontend/yarn.lock | 10 +++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..6313b56c5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/frontend/package.json b/frontend/package.json index a2b04ab2a..159375936 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,9 +4,9 @@ "main": "src/index.js", "license": "MIT", "scripts": { - "start": "NODE_ENV=development nodemon server/index.js", - "start:prod": "NODE_ENV=production node server/index.js", - "build": "NODE_ENV=production webpack --config webpack.prod.js", + "start": "cross-env NODE_ENV=development nodemon server/index.js", + "start:prod": "cross-env NODE_ENV=production node server/index.js", + "build": "cross-env NODE_ENV=production webpack --config webpack.prod.js", "test": "jest --coverage" }, "devDependencies": { @@ -23,6 +23,7 @@ "babel-loader": "^8.0.2", "babel-minify-webpack-plugin": "^0.3.1", "clean-webpack-plugin": "^0.1.19", + "cross-env": "^5.2.0", "css-loader": "^1.0.0", "eslint": "^5.6.1", "eslint-config-airbnb": "^17.1.0", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 6774d28fa..6deaa1ed0 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4650,6 +4650,14 @@ create-react-context@^0.2.1: fbjs "^0.8.0" gud "^1.0.0" +cross-env@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2" + integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg== + dependencies: + cross-spawn "^6.0.5" + is-windows "^1.0.0" + cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -7178,7 +7186,7 @@ is-utf8@^0.2.0: resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= -is-windows@^1.0.2: +is-windows@^1.0.0, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== From 8c6fc28511bac71e2ef8a3f20ad34c483f65e819 Mon Sep 17 00:00:00 2001 From: Brandon Sharratt Date: Thu, 31 Jan 2019 09:00:22 -0800 Subject: [PATCH 224/226] fixed validate Api trying to get policy Api version --- microservices/validateApi/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservices/validateApi/app.py b/microservices/validateApi/app.py index 958f9bc98..d248fdd24 100644 --- a/microservices/validateApi/app.py +++ b/microservices/validateApi/app.py @@ -87,7 +87,7 @@ def version(): import pkg_resources # part of setuptools - v = pkg_resources.require("policy")[0].version + v = pkg_resources.require("validate")[0].version version = v if hash != "": From f4120dafc3c3783e3fc4bb0e6448eb1b95e27b47 Mon Sep 17 00:00:00 2001 From: Joshua Date: Thu, 31 Jan 2019 11:59:22 -0800 Subject: [PATCH 225/226] Add LF converted files for test. --- ...discussion_status_approved_request.feature | 12 ++-- .../manual_output_checking_component.feature | 36 ++++++------ .../team_sharing_component.feature | 42 +++++++------- .../output_checker/adjudicate request.feature | 32 +++++------ .../output_checker/claim_request.feature | 26 ++++----- .../output_checker/undo_approval.feature | 16 +++--- ...tered_requests_for_output_checkers.feature | 22 ++++---- ui_tests/OCWA.prj | 56 +++++++++---------- ui_tests/Test Cases/RunCucumberTests.tc | 16 +++--- ui_tests/console.properties | 14 ++--- 10 files changed, 136 insertions(+), 136 deletions(-) diff --git a/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature b/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature index 263130bd7..d3fd0a1fd 100644 --- a/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature +++ b/ui_tests/Include/features/administator/export_discussion_status_approved_request.feature @@ -1,7 +1,7 @@ -Feature: export discussion and status log of a request -As an administrator I need the ability to export a discussion / status log to a pdf file upon request approval so that I have a file-based log of the conversation independent of the database - - Scenario: generate an export log of a newly approved request - Given a request has a status of "Review in Progress" - When an output checker approves the request +Feature: export discussion and status log of a request +As an administrator I need the ability to export a discussion / status log to a pdf file upon request approval so that I have a file-based log of the conversation independent of the database + + Scenario: generate an export log of a newly approved request + Given a request has a status of "Review in Progress" + When an output checker approves the request Then a pdf file should be generates that chronologically lists the discussion about the request as well as status changes \ No newline at end of file diff --git a/ui_tests/Include/features/administator/manual_output_checking_component.feature b/ui_tests/Include/features/administator/manual_output_checking_component.feature index 62c5aa0c6..b2218fd80 100644 --- a/ui_tests/Include/features/administator/manual_output_checking_component.feature +++ b/ui_tests/Include/features/administator/manual_output_checking_component.feature @@ -1,19 +1,19 @@ -Feature: Enable / Disable manual output checker component -As an administrator I need the ability to disable the manual output checker components so that stakeholders that do not have a manual output checking step in their export process can still utilize the application - - Scenario: Manual output checking component turned off and passes all policy tests - Given the manual output checking component has been marked as disabled - And the request passes all policy tests - When a request is submitted - Then the request status should be "Approved" - - Scenario: Manual output checking component turned off and fails a policy test - Given the manual output checking component has been marked as disabled - And the request fails at least one policy test - When a request is submitted - Then the request status should be "Work in progress" - - Scenario: Manual output checking component is turned on - Given the manual output checking component has been marked as enabled - When a request is submitted +Feature: Enable / Disable manual output checker component +As an administrator I need the ability to disable the manual output checker components so that stakeholders that do not have a manual output checking step in their export process can still utilize the application + + Scenario: Manual output checking component turned off and passes all policy tests + Given the manual output checking component has been marked as disabled + And the request passes all policy tests + When a request is submitted + Then the request status should be "Approved" + + Scenario: Manual output checking component turned off and fails a policy test + Given the manual output checking component has been marked as disabled + And the request fails at least one policy test + When a request is submitted + Then the request status should be "Work in progress" + + Scenario: Manual output checking component is turned on + Given the manual output checking component has been marked as enabled + When a request is submitted Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui_tests/Include/features/administator/team_sharing_component.feature b/ui_tests/Include/features/administator/team_sharing_component.feature index 328d41da8..9f2f90f7d 100644 --- a/ui_tests/Include/features/administator/team_sharing_component.feature +++ b/ui_tests/Include/features/administator/team_sharing_component.feature @@ -1,22 +1,22 @@ -Feature: team sharing of requests -As an administrator I need the ability to enable / disable the ability for requesters to view / edit their team member's request on a per project basis so that multiple types of project sharing models can be accommodated - - Scenario outline: Team sharing enabled - Given team sharing has been marked as enabled - And requester A is logged in - And requester B on the same project exists - And requester B has a request - When requester A views team's requests - Then requester B's request status should be visible - Example: - | status | - | Draft | - | Awaiting review | - | Review in progress | - | Approved | - | Work in progress | - | Archived | - Scenario: Team sharing disabled - Given team sharing has been marked as disabled - When a request is submitted +Feature: team sharing of requests +As an administrator I need the ability to enable / disable the ability for requesters to view / edit their team member's request on a per project basis so that multiple types of project sharing models can be accommodated + + Scenario outline: Team sharing enabled + Given team sharing has been marked as enabled + And requester A is logged in + And requester B on the same project exists + And requester B has a request + When requester A views team's requests + Then requester B's request status should be visible + Example: + | status | + | Draft | + | Awaiting review | + | Review in progress | + | Approved | + | Work in progress | + | Archived | + Scenario: Team sharing disabled + Given team sharing has been marked as disabled + When a request is submitted Then the request status should be "Awaiting review" \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/adjudicate request.feature b/ui_tests/Include/features/output_checker/adjudicate request.feature index aa0da9e64..2ab0758cf 100644 --- a/ui_tests/Include/features/output_checker/adjudicate request.feature +++ b/ui_tests/Include/features/output_checker/adjudicate request.feature @@ -1,17 +1,17 @@ -Feature: Adjudicate request -As an output checker I need the ability to change the status of a request to "Revisions required" so that I can allow the requester to tweak their request without having deny the request and forcing the requester to create a new request -As an output checker I need the ability to change the status of a request to "Approved" so that I can allow the requester to take their outputs out of the SRE - - Scenario: Request is worthy of approval - Given A request exists that is in "Review in Progress" - And the output checker is assigned to the request - When the output checker marks the request as approved - Then the output checker should see the status of the request updated to "Approved" - And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request - - Scenario: Request is needs revisions - Given A request exists that is in "Review in Progress" - And the output checker is assigned to the request - When the output checker marks the request as needs revisions - Then the output checker should see the status of the request updated to "Work in progress" +Feature: Adjudicate request +As an output checker I need the ability to change the status of a request to "Revisions required" so that I can allow the requester to tweak their request without having deny the request and forcing the requester to create a new request +As an output checker I need the ability to change the status of a request to "Approved" so that I can allow the requester to take their outputs out of the SRE + + Scenario: Request is worthy of approval + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as approved + Then the output checker should see the status of the request updated to "Approved" + And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request + + Scenario: Request is needs revisions + Given A request exists that is in "Review in Progress" + And the output checker is assigned to the request + When the output checker marks the request as needs revisions + Then the output checker should see the status of the request updated to "Work in progress" And the status of "Review in progress" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/claim_request.feature b/ui_tests/Include/features/output_checker/claim_request.feature index 371010dd3..f77367189 100644 --- a/ui_tests/Include/features/output_checker/claim_request.feature +++ b/ui_tests/Include/features/output_checker/claim_request.feature @@ -1,14 +1,14 @@ -Feature: Claim a request -As an output checker I need the ability to claim a request so that I can let my fellow output checker know that I'm going to be working on a particular request - -Scenario: Claim an unclaimed request -Given output checker has logged in -When output checker tries to claim an unclaimed request -Then the output checker should be able to see that they're now assigned the request - -Scenario: Claim a request already claimed by another output checker -Given output checker has logged in - And at least on other output checker exists - And the other output checker is assigned to a request -When output checker tries to claim the already assigned request +Feature: Claim a request +As an output checker I need the ability to claim a request so that I can let my fellow output checker know that I'm going to be working on a particular request + +Scenario: Claim an unclaimed request +Given output checker has logged in +When output checker tries to claim an unclaimed request +Then the output checker should be able to see that they're now assigned the request + +Scenario: Claim a request already claimed by another output checker +Given output checker has logged in + And at least on other output checker exists + And the other output checker is assigned to a request +When output checker tries to claim the already assigned request Then the output checker should be able to see that they're now assigned the request \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/undo_approval.feature b/ui_tests/Include/features/output_checker/undo_approval.feature index d82687a8f..18b89a1cf 100644 --- a/ui_tests/Include/features/output_checker/undo_approval.feature +++ b/ui_tests/Include/features/output_checker/undo_approval.feature @@ -1,9 +1,9 @@ -Feature: Undo request approval -As an output checker I need the ability to undo a request approval so that I can appropriately update requests to fix requests that were accidently approved or need to be made unavailable to an requester - -Scenario: Undo an approved request -Given output checker has logged in - And at least one approved request exists -When output checker submits an approved request to undo -Then the output checker should see that the request is now has a status of "Work in progress" +Feature: Undo request approval +As an output checker I need the ability to undo a request approval so that I can appropriately update requests to fix requests that were accidently approved or need to be made unavailable to an requester + +Scenario: Undo an approved request +Given output checker has logged in + And at least one approved request exists +When output checker submits an approved request to undo +Then the output checker should see that the request is now has a status of "Work in progress" And the status of "Accepted" and the transition to "Work in progress" should be recorded in the information about the request \ No newline at end of file diff --git a/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature b/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature index 0300a9ed3..06918c97e 100644 --- a/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature +++ b/ui_tests/Include/features/output_checker/view_filtered_requests_for_output_checkers.feature @@ -1,12 +1,12 @@ -Feature: See a list of all output checking requests -As an output checker I need the ability to see all requests so that I can quickly see what is in the queue - -Scenario Outline: View requests - Given output checker has logged in - When output checker selects a filter - Then the output checker should only see requests of type - Examples: - | filter | filter_condition | - | My requests | requests claimed by the output checker | - | Unassigned | requests not claimed by an output checker | +Feature: See a list of all output checking requests +As an output checker I need the ability to see all requests so that I can quickly see what is in the queue + +Scenario Outline: View requests + Given output checker has logged in + When output checker selects a filter + Then the output checker should only see requests of type + Examples: + | filter | filter_condition | + | My requests | requests claimed by the output checker | + | Unassigned | requests not claimed by an output checker | | All | all requests | \ No newline at end of file diff --git a/ui_tests/OCWA.prj b/ui_tests/OCWA.prj index b6f147e8e..fc7738ecd 100644 --- a/ui_tests/OCWA.prj +++ b/ui_tests/OCWA.prj @@ -1,28 +1,28 @@ - - - Katalon with Cucumber support - OCWA - - 3d119e91-3135-4c99-aab6-6022650ddbe1 - 5.9.0 - 0 - - - - Include/scripts/groovy - - - - - Include/scripts/groovy - - - Include/features - - - Include/config - - - - GENERIC - + + + Katalon with Cucumber support + OCWA + + 3d119e91-3135-4c99-aab6-6022650ddbe1 + 5.9.0 + 0 + + + + Include/scripts/groovy + + + + + Include/scripts/groovy + + + Include/features + + + Include/config + + + + GENERIC + diff --git a/ui_tests/Test Cases/RunCucumberTests.tc b/ui_tests/Test Cases/RunCucumberTests.tc index de22fa419..68dcd2850 100644 --- a/ui_tests/Test Cases/RunCucumberTests.tc +++ b/ui_tests/Test Cases/RunCucumberTests.tc @@ -1,8 +1,8 @@ - - - - RunCucumberTests - - - 9ff0f7de-66e4-496b-8b61-802a9ed960fd - + + + + RunCucumberTests + + + 9ff0f7de-66e4-496b-8b61-802a9ed960fd + diff --git a/ui_tests/console.properties b/ui_tests/console.properties index 417380976..710966d84 100644 --- a/ui_tests/console.properties +++ b/ui_tests/console.properties @@ -1,7 +1,7 @@ -#Sat Sep 08 18:41:21 NZST 2018 -deviceId= -kobitonDeviceId= -qTestDestId= -qTestDestType= -remoteWebDriverType=Selenium -remoteWebDriverUrl= +#Sat Sep 08 18:41:21 NZST 2018 +deviceId= +kobitonDeviceId= +qTestDestId= +qTestDestType= +remoteWebDriverType=Selenium +remoteWebDriverUrl= From 97d95492c39d453d7ded45ae720433b6d3fe922d Mon Sep 17 00:00:00 2001 From: Jeremy Ho Date: Thu, 31 Jan 2019 13:15:08 -0800 Subject: [PATCH 226/226] Add ui_tests/bin to .gitignore Ensure Katalon Studio can open with lf endings Minor markdown lint formatting Signed-off-by: Jeremy Ho --- README.md | 23 +++- ui_tests/.gitignore | 1 + ui_tests/.project | 18 +++ ui_tests/Libs/internal/GlobalVariable.groovy | 118 ++++++++++++++++--- 4 files changed, 142 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 059603069..97d726e95 100644 --- a/README.md +++ b/README.md @@ -1,64 +1,76 @@ -# Repo for Output Checker Workflow App +# Repo for Output Checker Workflow App + [![Build Status](https://travis-ci.org/bcgov/OCWA.svg?branch=master)](https://travis-ci.org/bcgov/OCWA) OCWA (pronounced "aqua") ## Components + ### Forum Api + [README](/microservices/forumApi/README.md) The forum API is a nodejs api providing topics (with subtopics), comments and permissions for them. Api docs are available using the OpenApi v3 specification by running the API and visiting /v1/api-docs. The Forum API also provides a websocket interface for being notified when new topics/comments are created that are relevant to the user. ### Policy Api + [README](/microservices/policyApi/README.md) The policy API is a python api providing a policy. A policy consists of multiple rules rules define source to execute in python on a file. Policy/Rules are specified using the [HCL language](https://github.com/hashicorp/hcl). Api docs are available using the OpenApi v3 specification by running the API and visiting /v1/api-docs. ### Validation Api + [README](/microservices/validateApi/README.md) The validate API is a python api providing a validation. The validation api uses validates files from the storage api Api docs are available using the OpenApi v3 specification by running the API and visiting /v1/api-docs. Note that the Validation API is not intended to be forward facing and is intended to be accessed only by other apis with an api key/secret. ### Request Api + [README](/microservices/requestApi/README.md) The request API is a nodejs api providing the business logic behind OCWA. It uses the forum api to provide permissions by making a topic with a 1-1 request correlation. Api docs are available using the OpenApi v3 specification by running the API and visiting /v1/api-docs. - ### Storage Api + [README](/microservices/storageApi/README.md) The storage API is a combination of open source existing products. Minio is used to treat any underlying storage as though it was S3 so that only one backend needs to be supported even if the backend is GCP/Azure/Local Disk or actually S3. TUSD is used to support large file uploads so that they can be resumed if interrupted due to a connection drop or whatever reason. ### Front End + [README](/frontend/README.md) The front end is written using ReactJs. It implements the apis. ## Helm + There is a helm chart in this top level. It deploys all of OCWA in one convenient package. For both below helm commands make a copy of values.yaml within the helm/ocwa directory and modify it to contain the values specific for your deployment. ### Helm install (Kubernetes) + helm dep up ./helm/ocwa helm install --name ocwa --namespace ocwa ./helm/ocwa -f ./helm/ocwa/config.yaml ### Helm update (Kubernetes) + helm dep up ./helm/ocwa helm upgrade ocwa ./helm/ocwa -f ./helm/ocwa/config.yaml ### Openshift (OCP) + Openshift is a bit of a different deployment as helm is not supported by the test deployment area. Additionally due to the way Openshift runs containers as a random UID many of the images that work for Kubernetes/Docker and are standard do not work on OpenShift. As a result the following changes are required. Mongo Image (forum-api: mongoImage: repository: ) registry.access.redhat.com/rhscl/mongodb-34-rhel7 Because the mongo image is different the below must also change -``` + +``` yaml forum-api: dbPod: persistence: /var/lib/mongodb/data @@ -71,11 +83,14 @@ forum-api: ``` ## Contributing + If you update apis that changes the signature at all, it is required to be under a new release (ie /v2 instead of /v1). The APIs are written specifically to make this easy. You must pass the travis ci builds to be able to submit a pull request that is pullable. ## Notes -```Default Port list: + +``` text +Default Port list: Forum WS: 2999 Forum Api: 3000 Forum WS(Nginx): 3001 diff --git a/ui_tests/.gitignore b/ui_tests/.gitignore index b9d3bf996..9033f96fa 100644 --- a/ui_tests/.gitignore +++ b/ui_tests/.gitignore @@ -1,4 +1,5 @@ # Katalon Studio +bin Reports/* ReportFolder/* Profiles/local.glbl diff --git a/ui_tests/.project b/ui_tests/.project index 9899034dd..5d2f13be6 100644 --- a/ui_tests/.project +++ b/ui_tests/.project @@ -106,5 +106,23 @@ (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + 1548965259656 + + 10 + + org.eclipse.core.resources.regexFilterMatcher + .*\.svn$ + + + + 1548965259667 + + 6 + + org.eclipse.core.resources.regexFilterMatcher + (.*\.svn-base$)|(.*\.png$)|(.*\.log$)|(.*\.xlsx$)|(.*\.xls$)|(.*\.csv$)|(.*\.txt$) + + diff --git a/ui_tests/Libs/internal/GlobalVariable.groovy b/ui_tests/Libs/internal/GlobalVariable.groovy index 7865384f0..8848275e8 100644 --- a/ui_tests/Libs/internal/GlobalVariable.groovy +++ b/ui_tests/Libs/internal/GlobalVariable.groovy @@ -12,34 +12,124 @@ import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase * This class is generated automatically by Katalon Studio and should not be modified or deleted. */ public class GlobalVariable { - + /** *

*/ public static Object OCWA_URL - + + /** + *

+ */ + public static Object OCWA_USER_RESEARCHER + + /** + *

+ */ + public static Object OCWA_USER_RESEARCHER_PSWD + + /** + *

+ */ + public static Object TestFilePath + + /** + *

+ */ + public static Object ValidFileName + + /** + *

+ */ + public static Object WarningExtensionFileName + + /** + *

+ */ + public static Object BlockedExtensionFileName + + /** + *

+ */ + public static Object MinSizeLimitFileName + /** *

*/ - public static Object TestFile1Path - + public static Object WarningMaxSizeLimitFileName + /** *

*/ - public static Object TestFile2Path - + public static Object BlockedMaxSizeLimitFileName + + /** + *

+ */ + public static Object BlockedStudyIDFileName + + /** + *

+ */ + public static Object ValidFileName2 + + /** + *

+ */ + public static Object SupportingFileName + + /** + *

+ */ + public static Object SupportingFileName2 + + /** + *

+ */ + public static Object OCWA_USER_TEAM_MEMBER + + /** + *

+ */ + public static Object OCWA_USER_TEAM_MEMBER_PSWD + + /** + *

+ */ + public static Object ValidFileName3 + static { def allVariables = [:] - allVariables.put('default', ['OCWA_URL' : 'http://ocwa-cddi-dlt-dev.pathfinder.gov.bc.ca', 'TestFile1Path' : 'C:\\\\\\\\Users\\\\PaulR\\\\\\\\Documents\\\\\\\\2 - Metadata\\\\\\\\HAS project\\\\\\\\hospital_visits_bc_2017.csv', 'TestFile2Path' : 'C:\\\\\\\\Users\\\\PaulR\\\\\\\\Documents\\\\\\\\2 - Metadata\\\\\\\\HAS project\\\\\\\\sports_accidents_bc_2017.csv']) - allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'http://localhost:8000', 'TestFile1Path' : '/home/travis/build/bcgov/OCWA/ui_tests/testfile1.csv', 'TestFile2Path' : '/home/travis/build/bcgov/OCWA/ui_tests/testfile2.csv']) - + allVariables.put('default', ['OCWA_URL' : 'http://localhost:8000', 'OCWA_USER_RESEARCHER' : 'researcher_1', 'OCWA_USER_RESEARCHER_PSWD' : 'researcher_1_password', 'TestFilePath' : '/home/travis/build/bcgov/OCWA/ui_tests/test_files/', 'ValidFileName' : 'test_valid_file_upload.txt', 'WarningExtensionFileName' : 'test_warning_extension.csv', 'BlockedExtensionFileName' : 'test_blocked_file_extension.zip', 'MinSizeLimitFileName' : 'test_min_file_size_limit.txt', 'WarningMaxSizeLimitFileName' : 'test_warning_max_file_size_limit.txt', 'BlockedMaxSizeLimitFileName' : 'test_blocked_max_file_size_limit.txt', 'BlockedStudyIDFileName' : 'test_study_ids_in_file.txt', 'ValidFileName2' : 'test_valid_file_upload2.txt', 'SupportingFileName' : 'test_supporting_file.txt', 'SupportingFileName2' : 'test_supporting_file2.txt', 'OCWA_USER_TEAM_MEMBER' : 'groucho', 'OCWA_USER_TEAM_MEMBER_PSWD' : 'groucho1234', 'ValidFileName3' : 'test_valid_file_upload3.txt']) + allVariables.put('Travis', allVariables['default'] + ['OCWA_URL' : 'https://ocwa.example.demo', 'TestFilePath' : '/home/travis/build/bcgov/OCWA/ui_tests/test_files/']) + String profileName = RunConfiguration.getExecutionProfile() - def selectedVariables = allVariables[profileName] - OCWA_URL = selectedVariables['OCWA_URL'] - TestFile1Path = selectedVariables['TestFile1Path'] - TestFile2Path = selectedVariables['TestFile2Path'] - + + for(object in selectedVariables){ + String overridingGlobalVariable = RunConfiguration.getOverridingGlobalVariable(object.key) + if(overridingGlobalVariable != null){ + selectedVariables.put(object.key, overridingGlobalVariable) + } + } + + OCWA_URL = selectedVariables["OCWA_URL"] + OCWA_USER_RESEARCHER = selectedVariables["OCWA_USER_RESEARCHER"] + OCWA_USER_RESEARCHER_PSWD = selectedVariables["OCWA_USER_RESEARCHER_PSWD"] + TestFilePath = selectedVariables["TestFilePath"] + ValidFileName = selectedVariables["ValidFileName"] + WarningExtensionFileName = selectedVariables["WarningExtensionFileName"] + BlockedExtensionFileName = selectedVariables["BlockedExtensionFileName"] + MinSizeLimitFileName = selectedVariables["MinSizeLimitFileName"] + WarningMaxSizeLimitFileName = selectedVariables["WarningMaxSizeLimitFileName"] + BlockedMaxSizeLimitFileName = selectedVariables["BlockedMaxSizeLimitFileName"] + BlockedStudyIDFileName = selectedVariables["BlockedStudyIDFileName"] + ValidFileName2 = selectedVariables["ValidFileName2"] + SupportingFileName = selectedVariables["SupportingFileName"] + SupportingFileName2 = selectedVariables["SupportingFileName2"] + OCWA_USER_TEAM_MEMBER = selectedVariables["OCWA_USER_TEAM_MEMBER"] + OCWA_USER_TEAM_MEMBER_PSWD = selectedVariables["OCWA_USER_TEAM_MEMBER_PSWD"] + ValidFileName3 = selectedVariables["ValidFileName3"] } }