Merge pull request #860 from superdesk/devel

Devel

plugins/embed/.travis.yml

@@ -10,7 +10,4 @@ before_script:
 
 cache:
     - node_modules
-    - gui-resources/scripts/js/bower_components
-
-after_success:
-    - grunt coveralls
+    - gui-resources/scripts/js/bower_components

plugins/embed/Gruntfile.js

@@ -73,12 +73,10 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.loadNpmTasks('grunt-karma-coveralls');
-
     grunt.registerTask('hint', ['jshint:all', 'jscs:all']);
     grunt.registerTask('test', ['karma:once', 'mochaTest:all']);
     grunt.registerTask('build', ['hint', 'less:all', 'requirejs']);
-    grunt.registerTask('ci:travis', ['hint', 'karma:travis', 'mochaTest:all']);
+    grunt.registerTask('ci:travis', ['hint', 'karma:travis', 'mochaTest:all', 'coveralls']);
     grunt.registerTask('ci:bamboo', ['karma:bamboo', 'mochaTest:bamboo']);
     grunt.registerTask('default', ['githooks', 'server']);
 };

plugins/embed/gui-resources/scripts/js/views/posts.js

@@ -143,6 +143,9 @@ define([
         // Render `post` if `flag.autoRender: true` or if loading the next page,
         // otherwise add it as a pending post.
         checkPending: function(post) {
+            if (this.removePostFromCollection(post)) {
+                return;
+            }
             // `post.get('updateItem')` returns false for next page loading.
             if (!this.flags.autoRender && post.get('updateItem')) {
                 post.set('pending', true);

plugins/embed/gui-themes/themes/aamulehti/desktop.js

@@ -2,25 +2,27 @@
 
 define([
     'css!theme/liveblog',
-    'plugins/button-pagination',
+    'plugins/scroll-pagination',
     'plugins/twitter-widgets',
     'plugins/post-hash',
     'plugins/permanent-link',
     'plugins/social-share',
     'plugins/wrappup-toggle',
     'plugins/user-comments',
+    'plugins/status',
     'tmpl!theme/container',
     'tmpl!theme/item/base'
 ], function() {
     return {
         plugins: [
-            'button-pagination',
+            'scroll-pagination',
             'twitter-widgets',
             'post-hash',
             'permanent-link',
             'social-share',
             'wrappup-toggle',
-            'user-comments'
+            'user-comments',
+            'status'
         ]
     };
 });

plugins/embed/gui-themes/themes/ksml-light/desktop.js

@@ -2,25 +2,27 @@
 
 define([
     'css!theme/liveblog',
-    'plugins/button-pagination',
+    'plugins/scroll-pagination',
     'plugins/twitter-widgets',
     'plugins/post-hash',
     'plugins/permanent-link',
     'plugins/social-share',
     'plugins/wrappup-toggle',
     'plugins/user-comments',
+    'plugins/status',
     'tmpl!theme/container',
     'tmpl!theme/item/base'
 ], function() {
     return {
         plugins: [
-            'button-pagination',
+            'scroll-pagination',
             'twitter-widgets',
             'post-hash',
             'permanent-link',
             'social-share',
             'wrappup-toggle',
-            'user-comments'
+            'user-comments',
+            'status'
         ]
     };
 });

plugins/embed/gui-themes/themes/ksml/desktop.js

@@ -2,25 +2,27 @@
 
 define([
     'css!theme/liveblog',
-    'plugins/button-pagination',
+    'plugins/scroll-pagination',
     'plugins/twitter-widgets',
     'plugins/post-hash',
     'plugins/permanent-link',
     'plugins/social-share',
     'plugins/wrappup-toggle',
     'plugins/user-comments',
+    'plugins/status',
     'tmpl!theme/container',
     'tmpl!theme/item/base'
 ], function() {
     return {
         plugins: [
-            'button-pagination',
+            'scroll-pagination',
             'twitter-widgets',
             'post-hash',
             'permanent-link',
             'social-share',
             'wrappup-toggle',
-            'user-comments'
+            'user-comments',
+            'status'
         ]
     };
 });

plugins/embed/gui-themes/themes/sasa-light/desktop.js

@@ -9,6 +9,7 @@ define([
     'plugins/social-share',
     'plugins/wrappup-toggle',
     'plugins/user-comments',
+    'plugins/status',
     'tmpl!theme/container',
     'tmpl!theme/item/base'
 ], function() {
@@ -20,7 +21,8 @@ define([
             'permanent-link',
             'social-share',
             'wrappup-toggle',
-            'user-comments'
+            'user-comments',
+            'status'
         ]
     };
 });

plugins/embed/gui-themes/themes/sasa/desktop.js

@@ -2,25 +2,27 @@
 
 define([
     'css!theme/liveblog',
-    'plugins/button-pagination',
+    'plugins/scroll-pagination',
     'plugins/twitter-widgets',
     'plugins/post-hash',
     'plugins/permanent-link',
     'plugins/social-share',
     'plugins/wrappup-toggle',
     'plugins/user-comments',
+    'plugins/status',
     'tmpl!theme/container',
     'tmpl!theme/item/base'
 ], function() {
     return {
         plugins: [
-            'button-pagination',
+            'scroll-pagination',
             'twitter-widgets',
             'post-hash',
             'permanent-link',
             'social-share',
             'wrappup-toggle',
-            'user-comments'
+            'user-comments',
+            'status'
         ]
     };
 });

plugins/embed/gui-themes/themes/satakansa/desktop.js

@@ -2,25 +2,27 @@
 
 define([
     'css!theme/liveblog',
-    'plugins/button-pagination',
+    'plugins/scroll-pagination',
     'plugins/twitter-widgets',
     'plugins/post-hash',
     'plugins/permanent-link',
     'plugins/social-share',
     'plugins/wrappup-toggle',
     'plugins/user-comments',
+    'plugins/status',
     'tmpl!theme/container',
     'tmpl!theme/item/base'
 ], function() {
     return {
         plugins: [
-            'button-pagination',
+            'scroll-pagination',
             'twitter-widgets',
             'post-hash',
             'permanent-link',
             'social-share',
             'wrappup-toggle',
-            'user-comments'
+            'user-comments',
+            'status'
         ]
     };
 });

plugins/embed/gui-themes/themes/stt-fnb/desktop.js

@@ -9,6 +9,7 @@ define([
     'plugins/social-share',
     'plugins/wrappup-toggle',
     'plugins/user-comments',
+    'plugins/status',
     'tmpl!theme/container',
     'tmpl!theme/item/base'
 ], function() {
@@ -20,7 +21,8 @@ define([
             'permanent-link',
             'social-share',
             'wrappup-toggle',
-            'user-comments'
+            'user-comments',
+            'status'
         ]
     };
 });

plugins/embed/gui-themes/themes/stt-fnb/mobile.js

@@ -9,6 +9,7 @@ define([
     'plugins/social-share',
     'plugins/wrappup-toggle',
     'plugins/user-comments',
+    'plugins/status',
     'tmpl!theme/container',
     'tmpl!theme/item/base'
 ], function() {
@@ -20,7 +21,8 @@ define([
             'permanent-link',
             'social-share',
             'wrappup-toggle',
-            'user-comments'
+            'user-comments',
+            'status'
         ]
     };
 });

plugins/embed/gui-themes/themes/stt-fnb/quirks.js

@@ -9,6 +9,7 @@ define([
     'plugins/social-share',
     'plugins/wrappup-toggle',
     'plugins/user-comments',
+    'plugins/status',
     'tmpl!theme/container',
     'tmpl!theme/item/base'
 ], function() {
@@ -20,7 +21,8 @@ define([
             'permanent-link',
             'social-share',
             'wrappup-toggle',
-            'user-comments'
+            'user-comments',
+            'status'
         ]
     };
 });

plugins/embed/package.json

@@ -77,6 +77,7 @@
     "karma-requirejs": "^0.2.1",
     "karma-sinon-chai": "^0.1.5",
     "mocha": "^1.18.2",
+    "mocha-lcov-reporter": "0.0.1",
     "phantomjs": "^1.9.7-15",
     "protractor": "^0.23.1",
     "protractor-screenshot-reporter": "~0.0.4",

plugins/embed/spec/embed_spec.js

@@ -1,8 +1,11 @@
-/*global describe, beforeEach, expect, it, element, by, jasmine */
+/*global describe, beforeEach, expect, it, element, by */
 
+var randomText = require('./helpers/utils.js').UUIDv4;
 var gotoUri = require('./helpers/liveblog_frontend').gotoUri;
 var uploadFixtures = require('./helpers/liveblog_fixtures').uploadFixtures;
-var postCreateAndPublish = require('./helpers/liveblog_posts.js').postCreateAndPublish;
+var liveblogBackend = require('./helpers/liveblog_posts.js');
+var postCreateAndPublish = liveblogBackend.postCreateAndPublish;
+var postEdit = liveblogBackend.postEdit;
 
 // Protractor Params:
 var pp = protractor.getInstance().params;
@@ -37,29 +40,55 @@ describe('Embed', function() {
             });
         });
 
-        it(' is updates to show just added post', function() {
+        it(' is updating to show just added post', function() {
+            var postContent = randomText();
             postCreateAndPublish({
-                postContent: 'test123'
+                postContent: postContent
             });
-            console.log(
-                '[POST] published:' + jasmine.pp(Date())
-            );
             browser.wait(function() {
                 return browser.isElementPresent(
                     by.cssContainingText(
                         'div.liveblog-content p.post-text',
-                        'test123'
+                        postContent
                     )
                 );
-            }, pp.maxTimeout)
-            .then(function() {
-                console.log(
-                    '[POST] displayed:' + jasmine.pp(Date())
-                );
-            });
+            }, pp.maxTimeout);
             expect(true).toBe(true);
         }, pp.maxTimeout);
 
+        it(' is updating to show just edited post', function() {
+            var postContent = randomText(),
+                newContent = randomText(),
+                postId;
+            postCreateAndPublish({
+                postContent: postContent
+            }, function(e, r, j, id) {
+                postId = id;
+            });
+            browser.wait(function() {
+                return browser.isElementPresent(
+                    by.cssContainingText(
+                        'div.liveblog-content p.post-text',
+                        postContent
+                    )
+                );
+            }, pp.maxTimeout)
+            .then(function() {
+                postEdit({
+                        postId: postId,
+                        newContent: newContent
+                });
+                browser.wait(function() {
+                    return browser.isElementPresent(
+                        by.cssContainingText(
+                            'div.liveblog-content p.post-text',
+                            newContent
+                        )
+                    );
+                }, pp.maxTimeout);
+                expect(true).toBe(true);
+            });
+        }, pp.maxTimeout * 2);
     });
 
 });

plugins/embed/spec/helpers/liveblog_posts.js

@@ -7,6 +7,7 @@ var utils = require('./utils');
 var getIdFromHref = utils.getIdFromHref;
 
 exports.postCreate = postCreate;
+exports.postEdit = postEdit;
 exports.postPublish = postPublish;
 exports.postCreateAndPublish = postCreateAndPublish;
 
@@ -29,6 +30,26 @@ function postCreate(args, callback) {
     });
 }
 
+function postEdit(args, callback) {
+    callback = callback || function() {};
+    args = args || {};
+    var newContent = args.newContent || 'Test post',
+        blogId = args.blogId || protractor.getInstance().params.blogId,
+        postId = args.postId;
+    if (!postId) {
+        throw Error('No postId provided');
+    }
+    backendRequestAuth({
+        method: 'PUT',
+        uri: '/my/LiveDesk/Blog/' + blogId + '/Post/' + postId,
+        json: {
+            'Content': newContent
+        }
+    }, function(e, r, j) {
+        callback(e, r, j);
+    });
+}
+
 function postPublish(args, callback) {
     args = args || {};
     callback = callback || function() {};

plugins/livedesk/__plugin__/livedesk/populate_default_data.py

@@ -120,7 +120,7 @@ def createBlogMediaTypes():
            'sms': (False, '', '', ''),
            'comments': (False, '', '', ''),
            'google': (False, 'www.google.com', 'xml', ''),
-           'facebook': (False, 'www.facebook.com', 'xml', 'change-this-to-a-real-appid'),
+           'facebook': (False, 'www.facebook.com', 'xml', ''),
            'twitter': (False, 'www.twitter.com', 'xml', '{"ConsumerKey":"uLW0hK2KZosj8Yl4F17uKg","ConsumerSecret":"iRuM0j8pyUTYgbpwPLqAl9wTBn5JzQB4zLJaiUaEdyE"}'),
            'flickr': (False, 'www.flickr.com', 'xml', 'abf46ef4c670460e95d09cf368606b8a'),
            'youtube': (False, 'www.youtube.com', 'xml', ''),