Skip to content

Commit 715e304

Browse files
VladislavKostyukevichVladislavKostyukevich
authored
Merge pull request #58 from aquality-automation/develop
0.3.3
2 parents 48bbcff + 60b8555 commit 715e304

File tree

231 files changed

+6752
-2796
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+6752
-2796
lines changed

‎.angular-cli.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@
5454
"exclude": "**/node_modules/**"
5555
}
5656
],
57-
"test": {
58-
"karma": {
59-
"config": "./karma.conf.js"
60-
}
61-
},
6257
"defaults": {
6358
"styleExt": "css",
6459
"component": {

‎.circleci/config.yml‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,21 @@ jobs:
1010
steps:
1111
- checkout
1212

13+
- run:
14+
name: Install [email protected]
15+
command: |
16+
export NVM_DIR="/opt/circleci/.nvm"
17+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
18+
nvm install v10.15.3
19+
nvm alias default v10.15.3
20+
npm version
21+
1322
- restore_cache:
1423
keys:
1524
- v1-dependencies-{{ checksum "package.json" }}
1625

1726
- run:
27+
shell: "/bin/bash -eo pipefail"
1828
name: Install Dependencies
1929
command: npm i --quiet
2030

@@ -34,14 +44,37 @@ jobs:
3444
appropriate/curl -4 --retry 10 --retry-delay 20 --retry-connrefused http://localhost:8080/api/authInfo
3545
3646
- run:
47+
shell: "/bin/bash -eo pipefail"
48+
name: Start Aquality Test Run
49+
command: |
50+
export NVM_DIR="/opt/circleci/.nvm"
51+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
52+
export TESTRUNID="$(npm run aquality:start -- ${TOKEN} All Docker_Chrome build_${CIRCLE_BUILD_NUM})"
53+
export TESTRUNID=${TESTRUNID##*$'\n'}
54+
echo $TESTRUNID
55+
echo "export TESTRUNID=$TESTRUNID" >> $BASH_ENV
56+
57+
- run:
58+
shell: "/bin/bash -eo pipefail"
3759
name: Run tests
3860
command: |
61+
export NVM_DIR="/opt/circleci/.nvm"
62+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
3963
sudo mkdir allure-results
40-
docker build . -t tests
64+
docker build --build-arg TOKEN="${TOKEN}" --build-arg TESTRUNID="${TESTRUNID}" . -t tests
4165
docker run -ti --rm -v /home/circleci/repo/allure-results:/app/allure-results --network container:api_tomcat_1 tests
42-
cd allure-results
43-
ls
44-
66+
npm run aquality:finish -- ${TOKEN} ${TESTRUNID}
67+
68+
- run:
69+
shell: "/bin/bash -eo pipefail"
70+
when: always
71+
name: Finish Aquality Test Run
72+
command: |
73+
echo ${TESTRUNID}
74+
export NVM_DIR="/opt/circleci/.nvm"
75+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
76+
npm run aquality:finish -- ${TOKEN} ${TESTRUNID}
77+
4578
- run:
4679
when: always
4780
name: Generate allure

‎CHANGELOG.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
# CHANGELOG
22

3-
## 0.3.2 (unreleased)
3+
## 0.3.3 (2019-11-16)
4+
5+
Features:
6+
- Rename Import Token to API Token -> [View Issue](https://github.com/aquality-automation/aquality-tracking-ui/issues/23)
7+
- Steps Feature -> [View Issue](https://github.com/aquality-automation/aquality-tracking-ui/issues/46)
8+
- Regex Search by Errors for Import -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/17)
9+
10+
Bugfixes:
11+
- Suite Matrix does not work -> [View Issue](https://github.com/aquality-automation/aquality-tracking-ui/issues/18)
12+
- Local Manager can see Local Permissions page -> [View Issue](https://github.com/aquality-automation/aquality-tracking-ui/issues/22)
13+
- Test View: Suite link leads to 404 page -> [View Issue](https://github.com/aquality-automation/aquality-tracking-ui/issues/39)
14+
- Redirection was wrong when token expired
15+
16+
## 0.3.2 (2019-09-10)
417

518
Features:
619

‎Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
FROM node:10.15.3 as runTests
22
WORKDIR /app
33
COPY . /app
4+
ARG TOKEN
5+
ENV AT_TOKEN=$TOKEN
6+
ARG TESTRUNID
7+
ENV AT_TESTRUNID=$TESTRUNID
48
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
59
RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list
610
RUN apt-get update

‎e2e/data/attachments/attach.docx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doc

‎e2e/data/attachments/image.jpg‎

26.4 KB
Loading

‎e2e/data/import/regexImportErrorSearch/differentError.json‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
[
2+
{
3+
"description": "Test Report",
4+
"keyword": "Feature",
5+
"name": "Test Feature with all results",
6+
"line": 2,
7+
"id": "Test-Report",
8+
"tags": [],
9+
"uri": "features/testdeature.feature",
10+
"elements": [
11+
{
12+
"id": "passed",
13+
"keyword": "Scenario",
14+
"line": 7,
15+
"name": "All passed",
16+
"tags": [],
17+
"type": "scenario",
18+
"steps": [
19+
{
20+
"arguments": [],
21+
"keyword": "Given ",
22+
"line": 8,
23+
"name": "passed step",
24+
"match": {
25+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
26+
},
27+
"result": {
28+
"status": "passed",
29+
"duration": 7033
30+
}
31+
},
32+
{
33+
"arguments": [],
34+
"keyword": "Then ",
35+
"line": 9,
36+
"name": "passed step",
37+
"match": {
38+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
39+
},
40+
"result": {
41+
"status": "passed",
42+
"duration": 86
43+
}
44+
}
45+
]
46+
}, {
47+
"id": "failed",
48+
"keyword": "Scenario",
49+
"line": 7,
50+
"name": "step failed",
51+
"tags": [],
52+
"type": "scenario",
53+
"steps": [
54+
{
55+
"arguments": [],
56+
"keyword": "Given ",
57+
"line": 8,
58+
"name": "passed step",
59+
"match": {
60+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
61+
},
62+
"result": {
63+
"status": "passed",
64+
"duration": 7033
65+
}
66+
},
67+
{
68+
"arguments": [],
69+
"keyword": "Then ",
70+
"line": 9,
71+
"name": "failed step",
72+
"match": {
73+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
74+
},
75+
"result": {
76+
"status": "failed",
77+
"duration": 86,
78+
"error_message": "step was failed\n log asdf sadf asdf dsd dd d d d d d dasd asdf [error]\nExpected 1\n[error]"
79+
}
80+
}
81+
]
82+
}, {
83+
"id": "failed",
84+
"keyword": "Scenario",
85+
"line": 7,
86+
"name": "Step skipped",
87+
"tags": [],
88+
"type": "scenario",
89+
"steps": [
90+
{
91+
"arguments": [],
92+
"keyword": "Given ",
93+
"line": 8,
94+
"name": "passed step",
95+
"match": {
96+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
97+
},
98+
"result": {
99+
"status": "passed",
100+
"duration": 7033
101+
}
102+
},
103+
{
104+
"arguments": [],
105+
"keyword": "Then ",
106+
"line": 9,
107+
"name": "skipped step",
108+
"match": {
109+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
110+
},
111+
"result": {
112+
"status": "skipped",
113+
"duration": 86,
114+
"error_message": "step was skipped"
115+
}
116+
}
117+
]
118+
}
119+
]
120+
}
121+
]

‎e2e/data/import/regexImportErrorSearch/firstError.json‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
[
2+
{
3+
"description": "Test Report",
4+
"keyword": "Feature",
5+
"name": "Test Feature with all results",
6+
"line": 2,
7+
"id": "Test-Report",
8+
"tags": [],
9+
"uri": "features/testdeature.feature",
10+
"elements": [
11+
{
12+
"id": "passed",
13+
"keyword": "Scenario",
14+
"line": 7,
15+
"name": "All passed",
16+
"tags": [],
17+
"type": "scenario",
18+
"steps": [
19+
{
20+
"arguments": [],
21+
"keyword": "Given ",
22+
"line": 8,
23+
"name": "passed step",
24+
"match": {
25+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
26+
},
27+
"result": {
28+
"status": "passed",
29+
"duration": 7033
30+
}
31+
},
32+
{
33+
"arguments": [],
34+
"keyword": "Then ",
35+
"line": 9,
36+
"name": "passed step",
37+
"match": {
38+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
39+
},
40+
"result": {
41+
"status": "passed",
42+
"duration": 86
43+
}
44+
}
45+
]
46+
}, {
47+
"id": "failed",
48+
"keyword": "Scenario",
49+
"line": 7,
50+
"name": "step failed",
51+
"tags": [],
52+
"type": "scenario",
53+
"steps": [
54+
{
55+
"arguments": [],
56+
"keyword": "Given ",
57+
"line": 8,
58+
"name": "passed step",
59+
"match": {
60+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
61+
},
62+
"result": {
63+
"status": "passed",
64+
"duration": 7033
65+
}
66+
},
67+
{
68+
"arguments": [],
69+
"keyword": "Then ",
70+
"line": 9,
71+
"name": "failed step",
72+
"match": {
73+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
74+
},
75+
"result": {
76+
"status": "failed",
77+
"duration": 86,
78+
"error_message": "step was failed\n log 200 dasd asdf [error]\nExpected\n[error]"
79+
}
80+
}
81+
]
82+
}, {
83+
"id": "failed",
84+
"keyword": "Scenario",
85+
"line": 7,
86+
"name": "Step skipped",
87+
"tags": [],
88+
"type": "scenario",
89+
"steps": [
90+
{
91+
"arguments": [],
92+
"keyword": "Given ",
93+
"line": 8,
94+
"name": "passed step",
95+
"match": {
96+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
97+
},
98+
"result": {
99+
"status": "passed",
100+
"duration": 7033
101+
}
102+
},
103+
{
104+
"arguments": [],
105+
"keyword": "Then ",
106+
"line": 9,
107+
"name": "skipped step",
108+
"match": {
109+
"location": "Projects/nodejs-cucumber-sample-master/node_modules/cucumber/lib/support_code_library_builder/define_helpers.js:135"
110+
},
111+
"result": {
112+
"status": "skipped",
113+
"duration": 86,
114+
"error_message": "step was skipped"
115+
}
116+
}
117+
]
118+
}
119+
]
120+
}
121+
]

0 commit comments

Comments
 (0)