Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
vidjil
vidjil
Commits
e9d45017
Commit
e9d45017
authored
Nov 18, 2017
by
Mathieu Giraud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.gitlab-ci.yml, tests/Makefile: lauch external functional tests in a new stage
See
#2712
parent
1918d15a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
.gitlab-ci.yml
.gitlab-ci.yml
+17
-1
browser/test/Makefile
browser/test/Makefile
+4
-0
No files found.
.gitlab-ci.yml
View file @
e9d45017
...
@@ -11,6 +11,7 @@ stages:
...
@@ -11,6 +11,7 @@ stages:
-
test_unit
-
test_unit
-
deploy_review
-
deploy_review
-
test_functional
-
test_functional
-
test_functional_external
-
test_shouldvdj
-
test_shouldvdj
-
valgrind_unit
-
valgrind_unit
-
valgrind_functional
-
valgrind_functional
...
@@ -78,7 +79,22 @@ test_browser-functional:
...
@@ -78,7 +79,22 @@ test_browser-functional:
-
make -C browser
-
make -C browser
-
source /etc/profile.d/rvm.sh
-
source /etc/profile.d/rvm.sh
-
rvm use 2.1.1
-
rvm use 2.1.1
-
make headless_browser
-
HEADLESS=1 make -C browser/test functional
artifacts
:
paths
:
-
browser/
only
:
-
/^feature-[cw]\/.*$/
-
/^hotfix-[cw]\/.*$/
-
prod-client
test_browser-functional-external
:
stage
:
test_functional_external
script
:
-
make -C browser
-
source /etc/profile.d/rvm.sh
-
rvm use 2.1.1
-
HEADLESS=1 make -C browser/test external
artifacts
:
artifacts
:
paths
:
paths
:
-
browser/
-
browser/
...
...
browser/test/Makefile
View file @
e9d45017
...
@@ -5,10 +5,14 @@ unit: nightmare
...
@@ -5,10 +5,14 @@ unit: nightmare
headless
:
headless
:
HEADLESS
=
1
$(MAKE)
functional
HEADLESS
=
1
$(MAKE)
functional
HEADLESS
=
1
$(MAKE)
external
functional
:
../../doc/analysis-example1.vidjil
functional
:
../../doc/analysis-example1.vidjil
sh launch_functional_tests
"functional/test_*rb"
sh launch_functional_tests
"functional/test_*rb"
external
:
../../doc/analysis-example1.vidjil
sh launch_functional_tests
"functional/external_test_*rb"
functional-rbx
:
../../doc/analysis-example1.vidjil
functional-rbx
:
../../doc/analysis-example1.vidjil
LIVE_SERVER
=
http://app.vidjil.org/browser/ ruby test_browser.rb
LIVE_SERVER
=
http://app.vidjil.org/browser/ ruby test_browser.rb
...
...
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