summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-09-11 15:42:52 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-09-11 15:42:52 +0200
commit42628b133f2a2f18a23cf8c5803a3ffb86546c68 (patch)
tree28d9c8d09fcc2b102b9e5fc83a39c66a3f8b25e8
parent5b1c29b5a80ede572313428ac03415649555e28e (diff)
fix phpunit tests
-rw-r--r--db/feed.php2
-rw-r--r--js/Gruntfile.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/db/feed.php b/db/feed.php
index 72df6122e..c5b76656e 100644
--- a/db/feed.php
+++ b/db/feed.php
@@ -96,7 +96,7 @@ class Feed extends Entity implements IAPI, \JsonSerializable {
$url = substr($url, 4);
}
- $serialized['cssClass'] = str_replace('.', '-', $url);
+ $serialized['cssClass'] = 'custom-' . str_replace('.', '-', $url);
return $serialized;
}
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index 71f2fea30..f82b86bb1 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -135,7 +135,8 @@ module.exports = function (grunt) {
dir: '../tests'
},
options: {
- colors: true
+ colors: true,
+ configuration: '../phpunit.xml'
}
},
protractor_webdriver: {