From 1bacdd19d6aa4760ed65d29eaaa6cd3dfebe6627 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Thu, 6 Nov 2014 09:01:34 +0100
Subject: add php server to grunt

---
 js/Gruntfile.js                         | 15 +++++-
 js/package.json                         | 95 +++++++++++++++++----------------
 tests/integration/bootstrap.php         |  4 --
 tests/integration/db/ItemMapperTest.php |  3 ++
 4 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index a46388298..133cf0303 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -11,6 +11,7 @@ module.exports = function (grunt) {
     'use strict';
 
     // load needed modules
+    grunt.loadNpmTasks('grunt-php');
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-contrib-connect');
@@ -193,6 +194,16 @@ module.exports = function (grunt) {
                     base: 'tests/static/'
                 }
             }
+        },
+        php: {
+            dist: {
+                options: {
+                    port: 8080,
+                    keepalive: true,
+                    open: true,
+                    base: '../../../'
+                }
+            }
         }
     });
 
@@ -200,8 +211,8 @@ module.exports = function (grunt) {
     grunt.registerTask('default', ['jshint', 'concat',  'wrap', 'ngAnnotate',
                                    'uglify', 'cssmin']);
     grunt.registerTask('dev', ['watch:concat']);
-    grunt.registerTask('test', ['karma:unit']);
-    grunt.registerTask('php', ['watch:phpunit']);
+    grunt.registerTask('unit-js', ['karma:unit']);
+    grunt.registerTask('unit-php', ['watch:phpunit']);
     grunt.registerTask('e2e', ['protractor_webdriver', 'connect',
                                'protractor']);
     grunt.registerTask('ci-unit', ['default', 'karma:continuous']);
diff --git a/js/package.json b/js/package.json
index 13bdcb0e6..4de6dd2de 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,49 +1,50 @@
 {
-    "name": "ownCloud-news",
-    "version": "4.0.0",
-    "description": "An RSS/Atom feed reader",
-    "main": "build/app.js",
-    "scripts": {
-        "test": "grunt ci-unit"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/owncloud/news"
-    },
-    "keywords": [
-        "rss",
-        "atom",
-        "feed",
-        "reader",
-        "owncloud",
-        "app"
-    ],
-    "author": "Bernhard Posselt",
-    "license": "AGPL",
-    "bugs": {
-        "url": "https://github.com/owncloud/news/issues"
-    },
-    "homepage": "https://github.com/owncloud/news",
-    "devDependencies": {
-        "grunt": "^0.4.5",
-        "grunt-contrib-concat": "^0.5.0",
-        "grunt-contrib-connect": "^0.8.0",
-        "grunt-contrib-cssmin": "^0.10.0",
-        "grunt-contrib-jshint": "^0.10.0",
-        "grunt-contrib-uglify": "^0.6.0",
-        "grunt-contrib-watch": "^0.6.1",
-        "grunt-karma": "^0.9.0",
-        "grunt-ng-annotate": "^0.4.0",
-        "grunt-phpunit": "^0.3.6",
-        "grunt-protractor-runner": "^1.1.4",
-        "grunt-protractor-webdriver": "^0.1.9",
-        "grunt-wrap": "^0.3.0",
-        "karma": "^0.12.24",
-        "karma-chrome-launcher": "^0.1.5",
-        "karma-coverage": "^0.2.6",
-        "karma-firefox-launcher": "^0.1.3",
-        "karma-jasmine": "^0.2.3",
-        "karma-phantomjs-launcher": "^0.1.4"
-    },
-    "dependencies": {}
+  "name": "ownCloud-news",
+  "version": "4.0.0",
+  "description": "An RSS/Atom feed reader",
+  "main": "build/app.js",
+  "scripts": {
+    "test": "grunt ci-unit"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/owncloud/news"
+  },
+  "keywords": [
+    "rss",
+    "atom",
+    "feed",
+    "reader",
+    "owncloud",
+    "app"
+  ],
+  "author": "Bernhard Posselt",
+  "license": "AGPL",
+  "bugs": {
+    "url": "https://github.com/owncloud/news/issues"
+  },
+  "homepage": "https://github.com/owncloud/news",
+  "devDependencies": {
+    "grunt": "^0.4.5",
+    "grunt-contrib-concat": "^0.5.0",
+    "grunt-contrib-connect": "^0.8.0",
+    "grunt-contrib-cssmin": "^0.10.0",
+    "grunt-contrib-jshint": "^0.10.0",
+    "grunt-contrib-uglify": "^0.6.0",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-karma": "^0.9.0",
+    "grunt-ng-annotate": "^0.4.0",
+    "grunt-php": "^1.1.1",
+    "grunt-phpunit": "^0.3.6",
+    "grunt-protractor-runner": "^1.1.4",
+    "grunt-protractor-webdriver": "^0.1.9",
+    "grunt-wrap": "^0.3.0",
+    "karma": "^0.12.24",
+    "karma-chrome-launcher": "^0.1.5",
+    "karma-coverage": "^0.2.6",
+    "karma-firefox-launcher": "^0.1.3",
+    "karma-jasmine": "^0.2.3",
+    "karma-phantomjs-launcher": "^0.1.4"
+  },
+  "dependencies": {}
 }
diff --git a/tests/integration/bootstrap.php b/tests/integration/bootstrap.php
index 3c3193d3a..b9bbe6179 100644
--- a/tests/integration/bootstrap.php
+++ b/tests/integration/bootstrap.php
@@ -3,10 +3,6 @@ namespace OCA\News\Tests\Integration;
 
 require_once __DIR__ . '/../../../../lib/base.php';
 
-\OC_App::loadApps();
-\OC_User::setupBackends();
-\OC_Util::setupFS();
-
 
 class NewsIntegrationTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/integration/db/ItemMapperTest.php b/tests/integration/db/ItemMapperTest.php
index 97956b28d..2b9a0333c 100644
--- a/tests/integration/db/ItemMapperTest.php
+++ b/tests/integration/db/ItemMapperTest.php
@@ -27,8 +27,11 @@ class ItemMapperTest extends NewsIntegrationTest {
 
         $created = $this->itemMapper->insert($item);
 
+        var_dump($created);
+
         $fetched = $this->itemMapper->find($created->getId(), $this->userId);
 
+
         $this->assertEquals($item->getTitle(), $fetched->getTitle());
         $this->assertEquals($item->getGuid(), $fetched->getGuid());
         $this->assertEquals($item->getGuidHash(), $fetched->getGuidHash());
-- 
cgit v1.2.3