Merge pull request #112 from aquality-automation/feature/attachments

Feature/attachments

Author: VladislavKostyukevich

.angular-cli.json

@@ -43,37 +43,15 @@ jobs:
             docker run --network container:api_tomcat_1 \
               appropriate/curl -4 --retry 10 --retry-delay 20 --retry-connrefused http://localhost:8080/api/authInfo
 
-      - run:
-          shell: "/bin/bash -eo pipefail"
-          name: Start Aquality Test Run
-          command: |
-            export NVM_DIR="/opt/circleci/.nvm"
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-            export TESTRUNID="$(npm run aquality:start -- ${TOKEN} All Docker_Chrome build_${CIRCLE_BUILD_NUM}_${CIRCLE_BRANCH})"
-            export TESTRUNID=${TESTRUNID##*$'\n'}
-            echo $TESTRUNID
-            echo "export TESTRUNID=$TESTRUNID" >> $BASH_ENV
-
       - run:
           shell: "/bin/bash -eo pipefail"
           name: Run tests
           command: |
             export NVM_DIR="/opt/circleci/.nvm"
             [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
             sudo mkdir allure-results
-            docker build --build-arg TOKEN="${TOKEN}" --build-arg TESTRUNID="${TESTRUNID}" . -t tests 
+            docker build --build-arg TOKEN="${TOKEN}" --build-arg CIRCLE_BUILD_NUM="${CIRCLE_BUILD_NUM}" --build-arg CIRCLE_BRANCH="${CIRCLE_BRANCH}" --build-arg CIRCLE_BUILD_URL="${CIRCLE_BUILD_URL}" . -t tests 
             docker run -ti --rm -v /home/circleci/repo/allure-results:/app/allure-results --network container:api_tomcat_1 tests
-            npm run aquality:finish -- ${TOKEN} ${TESTRUNID}
-
-      - run:
-          shell: "/bin/bash -eo pipefail"
-          when: always
-          name: Finish Aquality Test Run
-          command: |
-            echo ${TESTRUNID}
-            export NVM_DIR="/opt/circleci/.nvm"
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-            npm run aquality:finish -- ${TOKEN} ${TESTRUNID}
 
       - run:
           when: always

.circleci/config.yml

@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]
@@ -8,6 +8,9 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.ts]
+quote_type = single
+
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false

.editorconfig

@@ -4,11 +4,19 @@
 /dist
 /tmp
 /out-tsc
-/api/apps
+# Only exists if Bazel was run
+/bazel-out
+
+# tests output
+/allure-results
 
 # dependencies
 /node_modules
 
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+
 # IDEs and editors
 /.idea
 .project
@@ -24,22 +32,18 @@
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.history/*
 
 # misc
 /.sass-cache
 /connect.lock
 /coverage
 /libpeerconnection.log
 npm-debug.log
+yarn-error.log
 testem.log
 /typings
 
-# e2e
-/e2e/*.js
-/e2e/*.map
-/allure-results
-/allure-report
-
 # System Files
 .DS_Store
 Thumbs.db

.gitignore

@@ -7,15 +7,8 @@
         {
             "type": "chrome",
             "request": "launch",
-            "name": "Launch Chrome",
-            "url": "http://localhost:4200",
-            "webRoot": "${workspaceFolder}"
-        },
-        {
-            "type": "chrome",
-            "request": "attach",
-            "name": "Attach to Chrome",
-            "port": 9222,
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8080",
             "webRoot": "${workspaceFolder}"
         },
         {
@@ -25,7 +18,7 @@
             "program": "${workspaceRoot}/node_modules/protractor/bin/protractor",
             "stopOnEntry": false,
             "args": [
-                "${workspaceRoot}/protractor.conf.js"
+                "${workspaceRoot}/e2e/protractor.conf.js"
             ]
         },
     ]

.vscode/launch.json

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 1.0.0 (Unreleased)
+
+Features:
+  - Migrate to Angular 9 -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/101)
+  - Add Execution environment column to Test History table -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/107)
+
+Bugfixes:
+  - [API] /api/public/test/create-or-update does not update list of suites -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/105)
+  - External issue link is incorrect on Issues table -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/108)
+  - Import is blocked when invalid regular expression was saved for issue -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/103)
+
 ## 0.3.10 (2020-05-17)
 
 Features:

CHANGELOG.md

@@ -3,8 +3,12 @@ WORKDIR /app
 COPY . /app
 ARG TOKEN
 ENV AT_TOKEN=$TOKEN
-ARG TESTRUNID
-ENV AT_TESTRUNID=$TESTRUNID
+ARG CIRCLE_BUILD_NUM
+ENV AT_CIRCLE_BUILD_NUM=$CIRCLE_BUILD_NUM
+ARG CIRCLE_BUILD_URL
+ENV AT_CIRCLE_BUILD_URL=$CIRCLE_BUILD_URL
+ARG CIRCLE_BRANCH
+ENV AT_CIRCLE_BRANCH=$CIRCLE_BRANCH
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
 RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list
 RUN apt-get update 

Dockerfile

@@ -1,7 +1,30 @@
-# aquality-tracking-ui
+# AqualityTrackingUi
 
-# Run Tests
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.6.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Run Tests
 
 1. Open `api` folder and update .env file with your values
 2. Run `docker-compose up`
-3. Go back to the root folder and use `runTests.bat` or `runTests.sh`
+3. Go back to the root folder and use `runTests.bat` or `runTests.sh`
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+