Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-03-31 00:41:35 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-03-31 00:41:43 +0400
commit329a293095d7c8a981529c08ec3ba8da90ece12f (patch)
treeee5c94310ffb9e78896a0ddb9bc813d1ecb2b724 /tests/angularjs
parent7c1a73db9d5683ccb074012a1e735124f21a74a4 (diff)
refs #4691 added more test cases
Diffstat (limited to 'tests/angularjs')
-rw-r--r--tests/angularjs/README.md2
-rwxr-xr-xtests/angularjs/scripts/install-ubuntu.sh (renamed from tests/angularjs/install-ubuntu.sh)0
-rwxr-xr-xtests/angularjs/scripts/run_once.sh4
-rwxr-xr-xtests/angularjs/scripts/travis.sh4
-rwxr-xr-xtests/angularjs/travis.sh4
5 files changed, 9 insertions, 5 deletions
diff --git a/tests/angularjs/README.md b/tests/angularjs/README.md
index 94217ba833..e49f9decd8 100644
--- a/tests/angularjs/README.md
+++ b/tests/angularjs/README.md
@@ -3,7 +3,7 @@
npm install .
### Ubuntu
-On Ubuntu you might be able to use the `install-ubuntu.sh` script. Have a look and give it a try
+On Ubuntu you might be able to use the `scripts/install-ubuntu.sh` script. Have a [look](https://github.com/piwik/piwik/blob/master/tests/angularjs/install-ubuntu.sh) and give it a try
## Used libs
MochaJS + Chai
diff --git a/tests/angularjs/install-ubuntu.sh b/tests/angularjs/scripts/install-ubuntu.sh
index 1883302849..1883302849 100755
--- a/tests/angularjs/install-ubuntu.sh
+++ b/tests/angularjs/scripts/install-ubuntu.sh
diff --git a/tests/angularjs/scripts/run_once.sh b/tests/angularjs/scripts/run_once.sh
new file mode 100755
index 0000000000..5f95af3fa5
--- /dev/null
+++ b/tests/angularjs/scripts/run_once.sh
@@ -0,0 +1,4 @@
+DIR=`dirname $0`
+cd $DIR
+cd ..
+./node_modules/karma/bin/karma start karma.conf.js --browsers PhantomJS --single-run \ No newline at end of file
diff --git a/tests/angularjs/scripts/travis.sh b/tests/angularjs/scripts/travis.sh
new file mode 100755
index 0000000000..f2002203ad
--- /dev/null
+++ b/tests/angularjs/scripts/travis.sh
@@ -0,0 +1,4 @@
+DIR=`dirname $0`
+cd $DIR
+./install-ubuntu.sh
+./run-once.sh \ No newline at end of file
diff --git a/tests/angularjs/travis.sh b/tests/angularjs/travis.sh
deleted file mode 100755
index 4909caa517..0000000000
--- a/tests/angularjs/travis.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-DIR=`dirname $0`
-cd $DIR
-./install-ubuntu.sh
-./node_modules/karma/bin/karma start --browsers PhantomJS --single-run karma.conf.js \ No newline at end of file