Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
vidjil
vidjil
Commits
33748bcd
Commit
33748bcd
authored
Jul 17, 2018
by
Ryan Herbert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include demo files for upload functional tests
parent
d295c176
Pipeline
#33640
failed with stages
in 3 minutes and 40 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
.gitlab-ci.yml
.gitlab-ci.yml
+1
-0
docker/vidjil-server/conf/defs.py
docker/vidjil-server/conf/defs.py
+1
-1
server/web2py/applications/vidjil/tests/functional/test_003_sample.rb
...y/applications/vidjil/tests/functional/test_003_sample.rb
+1
-1
No files found.
.gitlab-ci.yml
View file @
33748bcd
...
...
@@ -245,6 +245,7 @@ test_server_functional:
-
docker build --no-cache --build-arg git_branch=$CI_COMMIT_REF_NAME --build-arg build_env=TEST -t "vidjil/server:test" docker/vidjil-server
-
docker build --no-cache --build-arg git_branch=$CI_COMMIT_REF_NAME --build-arg build_env=TEST -t "vidjil/client:test" docker/vidjil-client
-
cd docker && docker-compose up -d && cd ..
-
docker exec docker_nginx_1 sed -i "s/^\(FILE_SOURCE .*\)/FILE_SOURCE = '\/usr\/share\/vidjil\/demo'/" /usr/share/vidjil/server/web2py/applications/vidjil/modules/defs.py
-
docker exec docker_nginx_1 make -C /usr/share/vidjil browser
-
docker exec docker_uwsgi_1 python /usr/share/vidjil/server/web2py/web2py.py -S vidjil -M -R /usr/share/vidjil/server/web2py/applications/vidjil/tests/functional/init_test_db.py
-
source /etc/profile.d/rvm.sh
...
...
docker/vidjil-server/conf/defs.py
View file @
33748bcd
...
...
@@ -70,7 +70,7 @@ SCHEDULER_HEARTBEAT = 5
# Directory to search for files
FILE_SOURCE
=
'/mnt/data/src'
FILE_TYPES
=
[
'fasta'
,
'fastq'
,
'fastq.gz'
]
FILE_TYPES
=
[
'fasta'
,
'fastq'
,
'fastq.gz'
,
'fa'
]
SET_TYPE_PATIENT
=
'patient'
SET_TYPE_RUN
=
'run'
...
...
server/web2py/applications/vidjil/tests/functional/test_003_sample.rb
View file @
33748bcd
...
...
@@ -54,7 +54,7 @@ class TestSampleSet < BrowserTest
for
i
in
0
..
num_additional_files
$b
.
div
(
:id
=>
"jstree_field_%d"
%
i
).
span
(
:text
=>
"browse"
).
click
assert
(
jstree
.
visible?
)
jstree_file
=
jstree
.
a
(
:id
=>
"//Demo-X5.fa
sta
_anchor"
)
jstree_file
=
jstree
.
a
(
:id
=>
"//Demo-X5.fa_anchor"
)
unless
jstree_file
.
present?
and
jstree_file
.
present?
jstree
.
a
(
:id
=>
"/_anchor"
).
double_click
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment