Skip to content

Commit ecdf83e

Browse files
JohanLorenzobhearsum
authored andcommitted
Bug 1299213 - Clean up ui/* now that no submodule is used (#115). r=bhearsum
1 parent 6f35e8c commit ecdf83e

19 files changed

+81
-386
lines changed

ui/.editorconfig renamed to .editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@ insert_final_newline = true
1111
[*.less]
1212
indent_size = 4
1313

14+
[*.py]
15+
indent_size = 4
16+
1417
[*.md]
1518
trim_trailing_whitespace = false

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,11 @@ cef.log
88
.cache
99
.tox
1010
*.egg-info
11+
1112
build
13+
generated
14+
dist
15+
16+
ui/node_modules
17+
18+
.DS_Store

.taskcluster.yml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tasks:
1313
command:
1414
- "/bin/bash"
1515
- "-c"
16-
- "git clone $GITHUB_HEAD_REPO_URL && cd balrog && git checkout $GITHUB_HEAD_BRANCH && bash run-tests.sh"
16+
- "git clone $GITHUB_HEAD_REPO_URL && cd balrog && git checkout $GITHUB_HEAD_BRANCH && bash run-tests.sh backend"
1717
features:
1818
dind: true
1919
extra:
@@ -23,10 +23,34 @@ tasks:
2323
- pull_request.*
2424
- push
2525
metadata:
26-
name: Balrog Tests
27-
description: Balrog Tests
26+
name: Balrog back-end tests
27+
description: Balrog Python tests
2828
owner: "{{ event.head.user.email }}"
2929
source: "{{ event.head.repo.url }}"
30+
31+
- provisionerId: "{{ taskcluster.docker.provisionerId }}"
32+
workerType: "{{ taskcluster.docker.workerType }}"
33+
payload:
34+
maxRunTime: 1200
35+
image: "rail/python-test-runner"
36+
command:
37+
- "/bin/bash"
38+
- "-c"
39+
- "git clone $GITHUB_HEAD_REPO_URL && cd balrog && git checkout $GITHUB_HEAD_BRANCH && bash run-tests.sh frontend"
40+
features:
41+
dind: true
42+
extra:
43+
github:
44+
env: true
45+
events:
46+
- pull_request.*
47+
- push
48+
metadata:
49+
name: Balrog front-end tests
50+
description: Balrog JavaScript tests
51+
owner: "{{ event.head.user.email }}"
52+
source: "{{ event.head.repo.url }}"
53+
3054
# TODO: make this depend on the test task after https://bugzilla.mozilla.org/show_bug.cgi?id=1252144 is fixed
3155
- provisionerId: "{{ taskcluster.docker.provisionerId }}"
3256
workerType: "{{ taskcluster.docker.workerType }}"
@@ -54,6 +78,7 @@ tasks:
5478
description: Balrog Docker Image Creation
5579
owner: "{{ event.head.user.email }}"
5680
source: "{{ event.head.repo.url }}"
81+
5782
- provisionerId: "{{ taskcluster.docker.provisionerId }}"
5883
workerType: "{{ taskcluster.docker.workerType }}"
5984
payload:
@@ -76,6 +101,7 @@ tasks:
76101
description: Balrog Agent Tests
77102
owner: "{{ event.head.user.email }}"
78103
source: "{{ event.head.repo.url }}"
104+
79105
# TODO: make this depend on the test task after https://bugzilla.mozilla.org/show_bug.cgi?id=1252144 is fixed
80106
- provisionerId: "{{ taskcluster.docker.provisionerId }}"
81107
workerType: "{{ taskcluster.docker.workerType }}"

README

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,12 @@ http://127.0.0.1:8080
1818

1919
And you can access the public interface with URLs such as:
2020
http://127.0.0.1:9090/update/3/Firefox/33.0/20141202185629/Darwin_x86_64-gcc3-u-i386-x86_64/en-US/release/default/default/default/update.xml?force=1
21+
22+
You may also want to run all tests available:
23+
24+
./run-tests.sh
25+
26+
If you prefer to run only tests for the front-end or the back-end, you can use:
27+
28+
./run-tests.sh frontend
29+
./run-tests.sh backend

scripts/test-entrypoint.sh

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
#!/bin/bash
22

3-
pip install -r /app/requirements-test.txt
4-
tox $@
3+
run_back_end_tests() {
4+
pip install -r /app/requirements-test.txt
5+
tox $@
6+
}
57

6-
cd ui/
7-
npm test
8+
run_front_end_tests() {
9+
cd ui/
10+
npm test
11+
}
12+
13+
type_of_tests="$1"
14+
15+
if [[ $type_of_tests == "backend" ]]; then
16+
shift
17+
run_back_end_tests $@
18+
elif [[ $type_of_tests == "frontend" ]]; then
19+
run_front_end_tests
20+
else
21+
run_back_end_tests $@
22+
run_front_end_tests
23+
fi

ui/.gitignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

ui/.npmignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

ui/.taskcluster.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

ui/README.md

Lines changed: 0 additions & 40 deletions
This file was deleted.

ui/dist/css/app.css

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)