Merge branch 'v3.x.x' into master

why was there a conflict anyway? did i forget a step last time?
SockDrawer · May 3, 2016 · f510f48 · f510f48
2 parents dd5f065 + 54c2a73
commit f510f48
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/providers/nodebb/post.js b/providers/nodebb/post.js
@@ -29,7 +29,7 @@ exports.bindPost = function bindPost(forum) {
          * This constructor is intended to be private use only, if you need to construct a post from payload data use
          * `Post.parse()` instead
          *
-         * @private
+         * @public
          * @class
          *
          * @param {*} payload Payload to construct the Post object out of

diff --git a/providers/nodebb/topic.js b/providers/nodebb/topic.js
@@ -29,7 +29,7 @@ exports.bindTopic = function bindTopic(forum) {
          * This constructor is intended for private use only, if you need top construct a topic from payload data use
          * `Topic.parse()` instead.
          *
-         * @private
+         * @public
          * @class
          *
          * @param {*} payload Payload to construct the User object out of

diff --git a/providers/nodebb/user.js b/providers/nodebb/user.js
@@ -30,7 +30,7 @@ exports.bindUser = function bindUser(forum) {
          * This constructor is intended to be private use only, if you need to construct a user from payload data use
          * `User.parse()` instead
          *
-         * @private
+         * @public
          * @class
          *
          * @param {*} payload Payload to construct the User object out of

diff --git a/test/lib/appTest.js b/test/lib/appTest.js
@@ -141,7 +141,6 @@ describe('lib/app', () => {
                 testModule.error.calledWith('Plugin alpha failed to load with error: Error: bad').should.be.true;
             });
         });
-
         it('should reject with error from forum.addPlugin when rejecting', () => {
             const cfg = Math.random();
             const plugin = Math.random();