Refactor view/content.

2025-08-13 01:14:07 +02:00 · 2015-04-29 23:08:38 +02:00
parent 0faf399abd
commit 8c34337136
7 changed files with 338 additions and 259 deletions
--- a/test/tests/unit/view/content.js
+++ b/test/tests/unit/view/content.js
@@ -2,7 +2,7 @@
 'use strict';

 var ID = 'view/content';
-var DEPS = ['_', '$', 'core/event', 'core/format', 'core/location', 'core/resource', 'core/settings', 'view/mainrow'];
+var DEPS = ['$', 'view/mainrow'];

 describe('module \'' + ID + '\'', function () {

@@ -10,35 +10,10 @@ describe('module \'' + ID + '\'', function () {

        this.definition = modulejs._private.definitions[ID];

-        this.xSettings = util.uniqObj();
-        this.xResource = {
-            icon: sinon.stub().returns(util.uniqPath('-icon.png'))
-        };
-        this.xFormat = {
-            formatSize: sinon.stub().returns(util.uniqId()),
-            formatDate: sinon.stub().returns(util.uniqId()),
-            setDefaultMetric: sinon.stub()
-        };
-        this.xEvent = {
-            sub: sinon.stub(),
-            pub: sinon.stub()
-        };
-        this.xLocation = {
-            setLink: sinon.stub()
-        };
        this.xMainrow = {$el: null};
-
        this.applyFn = function () {

-            this.xResource.icon.reset();
-            this.xFormat.formatSize.reset();
-            this.xFormat.formatDate.reset();
-            this.xFormat.setDefaultMetric.reset();
-            this.xEvent.sub.reset();
-            this.xEvent.pub.reset();
-            this.xLocation.setLink.reset();
-
-            return this.definition.fn(_, $, this.xEvent, this.xFormat, this.xLocation, this.xResource, this.xSettings, this.xMainrow);
+            return this.definition.fn($, this.xMainrow);
        };
    });

@@ -88,11 +63,11 @@ describe('module \'' + ID + '\'', function () {

    describe('application', function () {

-        it('returns object with 3 properties', function () {
+        it('returns object with 1 property', function () {

            var instance = this.applyFn();
            assert.isPlainObject(instance);
-            assert.lengthOfKeys(instance, 3);
+            assert.lengthOfKeys(instance, 1);
        });

        it('adds HTML #content to #mainrow', function () {
@@ -100,44 +75,6 @@ describe('module \'' + ID + '\'', function () {
            this.applyFn();
            assert.lengthOf($('#mainrow > #content'), 1);
        });
-
-        it('adds HTML #view to #content', function () {
-
-            this.applyFn();
-            assert.lengthOf($('#content > #view'), 1);
-        });
-
-        it('adds HTML #items to #view', function () {
-
-            this.applyFn();
-            assert.lengthOf($('#view > #items'), 1);
-        });
-
-        it('sets default metric', function () {
-
-            this.applyFn();
-            assert.isTrue(this.xFormat.setDefaultMetric.calledOnce);
-        });
-
-        it('subscribes to 2 events', function () {
-
-            this.applyFn();
-            assert.isTrue(this.xEvent.sub.calledTwice);
-        });
-
-        it('subscribes to location.changed', function () {
-
-            this.applyFn();
-            assert.strictEqual(this.xEvent.sub.firstCall.args[0], 'location.changed');
-            assert.isFunction(this.xEvent.sub.firstCall.args[1]);
-        });
-
-        it('subscribes to location.refreshed', function () {
-
-            this.applyFn();
-            assert.strictEqual(this.xEvent.sub.secondCall.args[0], 'location.refreshed');
-            assert.isFunction(this.xEvent.sub.secondCall.args[1]);
-        });
    });

    describe('.$el', function () {
@@ -151,30 +88,6 @@ describe('module \'' + ID + '\'', function () {
            assert.strictEqual(instance.$el.attr('id'), 'content');
        });
    });
-
-    describe('.$view', function () {
-
-        it('is $(\'#view\')', function () {
-
-            var instance = this.applyFn();
-            assert.isObject(instance.$view);
-            assert.lengthOf(instance.$view, 1);
-            assert.isString(instance.$view.jquery);
-            assert.strictEqual(instance.$view.attr('id'), 'view');
-        });
-    });
-
-    describe('.$items', function () {
-
-        it('is $(\'#items\')', function () {
-
-            var instance = this.applyFn();
-            assert.isObject(instance.$items);
-            assert.lengthOf(instance.$items, 1);
-            assert.isString(instance.$items.jquery);
-            assert.strictEqual(instance.$items.attr('id'), 'items');
-        });
-    });
 });

 }());
--- a/test/tests/unit/view/view.js
+++ b/test/tests/unit/view/view.js
@@ -0,0 +1,152 @@
+(function () {
+'use strict';
+
+var ID = 'view/view';
+var DEPS = ['_', '$', 'core/event', 'core/format', 'core/settings', 'view/content', 'view/item'];
+
+describe('module \'' + ID + '\'', function () {
+
+    before(function () {
+
+        this.definition = modulejs._private.definitions[ID];
+
+        this.xEvent = {
+            sub: sinon.stub(),
+            pub: sinon.stub()
+        };
+        this.xFormat = {
+            setDefaultMetric: sinon.stub()
+        };
+        this.xSettings = util.uniqObj();
+        this.xContent = {$el: null};
+        this.xItem = {render: sinon.stub()};
+
+        this.applyFn = function () {
+
+            this.xEvent.sub.reset();
+            this.xEvent.pub.reset();
+            this.xFormat.setDefaultMetric.reset();
+            this.xItem.render.reset();
+
+            return this.definition.fn(_, $, this.xEvent, this.xFormat, this.xSettings, this.xContent, this.xItem);
+        };
+    });
+
+    after(function () {
+
+        util.restoreHtml();
+    });
+
+    beforeEach(function () {
+
+        util.restoreHtml();
+        this.xContent.$el = $('<div id="content"/>').appendTo('body');
+    });
+
+    describe('definition', function () {
+
+        it('is defined', function () {
+
+            assert.isPlainObject(this.definition);
+        });
+
+        it('has correct id', function () {
+
+            assert.strictEqual(this.definition.id, ID);
+        });
+
+        it('requires correct', function () {
+
+            assert.deepEqual(this.definition.deps, DEPS);
+        });
+
+        it('args for each request', function () {
+
+            assert.strictEqual(this.definition.deps.length, this.definition.fn.length);
+        });
+
+        it('has no instance', function () {
+
+            assert.notProperty(modulejs._private.instances, ID);
+        });
+
+        it('inits without errors', function () {
+
+            this.applyFn();
+        });
+    });
+
+    describe('application', function () {
+
+        it('returns object with 2 properties', function () {
+
+            var instance = this.applyFn();
+            assert.isPlainObject(instance);
+            assert.lengthOfKeys(instance, 2);
+        });
+
+        it('adds HTML #view to #content', function () {
+
+            this.applyFn();
+            assert.lengthOf($('#content > #view'), 1);
+        });
+
+        it('adds HTML #items to #view', function () {
+
+            this.applyFn();
+            assert.lengthOf($('#view > #items'), 1);
+        });
+
+        it('sets default metric', function () {
+
+            this.applyFn();
+            assert.isTrue(this.xFormat.setDefaultMetric.calledOnce);
+        });
+
+        it('subscribes to 2 events', function () {
+
+            this.applyFn();
+            assert.isTrue(this.xEvent.sub.calledTwice);
+        });
+
+        it('subscribes to location.changed', function () {
+
+            this.applyFn();
+            assert.strictEqual(this.xEvent.sub.firstCall.args[0], 'location.changed');
+            assert.isFunction(this.xEvent.sub.firstCall.args[1]);
+        });
+
+        it('subscribes to location.refreshed', function () {
+
+            this.applyFn();
+            assert.strictEqual(this.xEvent.sub.secondCall.args[0], 'location.refreshed');
+            assert.isFunction(this.xEvent.sub.secondCall.args[1]);
+        });
+    });
+
+    describe('.$el', function () {
+
+        it('is $(\'#view\')', function () {
+
+            var instance = this.applyFn();
+            assert.isObject(instance.$el);
+            assert.lengthOf(instance.$el, 1);
+            assert.isString(instance.$el.jquery);
+            assert.strictEqual(instance.$el.attr('id'), 'view');
+        });
+    });
+
+    describe('.$items', function () {
+
+        it('is $(\'#items\')', function () {
+
+            var instance = this.applyFn();
+            assert.isObject(instance.$items);
+            assert.lengthOf(instance.$items, 1);
+            assert.isString(instance.$items.jquery);
+            assert.strictEqual(instance.$items.attr('id'), 'items');
+        });
+    });
+});
+
+}());
--- a/test/tests/unit/view/viewmode.js
+++ b/test/tests/unit/view/viewmode.js
@@ -2,7 +2,7 @@
 'use strict';

 var ID = 'view/viewmode';
-var DEPS = ['_', '$', 'core/resource', 'core/settings', 'core/store', 'view/content', 'view/sidebar'];
+var DEPS = ['_', '$', 'core/resource', 'core/settings', 'core/store', 'view/sidebar', 'view/view'];

 describe('module \'' + ID + '\'', function () {

@@ -10,18 +10,18 @@ describe('module \'' + ID + '\'', function () {

        this.definition = modulejs._private.definitions[ID];

-        this.xSettings = {
-            view: {}
-        };
        this.xResource = {
            image: sinon.stub().returns(util.uniqPath('-image.png'))
        };
+        this.xSettings = {
+            view: {}
+        };
        this.xStore = {
            get: sinon.stub(),
            put: sinon.stub()
        };
-        this.xContent = {$view: null};
        this.xSidebar = {$el: null};
+        this.xView = {$el: null};

        this.applyFn = function () {

@@ -29,7 +29,7 @@ describe('module \'' + ID + '\'', function () {
            this.xStore.get.reset();
            this.xStore.put.reset();

-            return this.definition.fn(_, $, this.xResource, this.xSettings, this.xStore, this.xContent, this.xSidebar);
+            return this.definition.fn(_, $, this.xResource, this.xSettings, this.xStore, this.xSidebar, this.xView);
        };
    });

@@ -41,8 +41,8 @@ describe('module \'' + ID + '\'', function () {
    beforeEach(function () {

        util.restoreHtml();
-        this.xContent.$view = $('<div id="view"/>').appendTo('body');
        this.xSidebar.$el = $('<div id="sidebar"/>').appendTo('body');
+        this.xView.$el = $('<div id="view"/>').appendTo('body');
    });

    describe('definition', function () {