diff --git a/test/specs/asset_manager/index.js b/test/specs/asset_manager/index.js index 8fc295fd0..8a48f468d 100644 --- a/test/specs/asset_manager/index.js +++ b/test/specs/asset_manager/index.js @@ -72,12 +72,6 @@ describe('Asset Manager', () => { expect(asset2.get('src')).toEqual(imgObj.src + '2'); }); - it('Src is unique', () => { - obj.add(imgObj); - obj.add(imgObj); - expect(obj.getAll().length).toEqual(1); - }); - it('Remove asset', () => { obj.add(imgObj); obj.remove(imgObj.src); diff --git a/test/specs/asset_manager/model/Assets.js b/test/specs/asset_manager/model/Assets.js index 24be1773c..6252ff363 100644 --- a/test/specs/asset_manager/model/Assets.js +++ b/test/specs/asset_manager/model/Assets.js @@ -21,31 +21,6 @@ module.exports = { it('Collection is empty', () => { expect(obj.length).toEqual(0); }); - - it("Can't insert assets without src", () => { - obj.add({}); - expect(obj.length).toEqual(0); - obj.add([{},{},{}]); - expect(obj.length).toEqual(0); - }); - - it("Insert assets only with src", () => { - obj.add([{},{src:'test'},{}]); - expect(obj.length).toEqual(1); - }); - - it('addImg creates new asset', () => { - obj.addImg('/img/path'); - expect(obj.length).toEqual(1); - }); - - it('addImg asset is correct', () => { - obj.addImg('/img/path'); - var asset = obj.at(0); - expect(asset.get('type')).toEqual('image'); - expect(asset.get('src')).toEqual('/img/path'); - }); - }); } }; diff --git a/test/specs/asset_manager/view/AssetImageView.js b/test/specs/asset_manager/view/AssetImageView.js index 2c25c99f0..b348172bb 100644 --- a/test/specs/asset_manager/view/AssetImageView.js +++ b/test/specs/asset_manager/view/AssetImageView.js @@ -16,6 +16,7 @@ module.exports = { var coll = new Assets(); var model = coll.add({ type:'image', src: '/test' }); this.view = new AssetImageView({ + collection: new Assets(), config : {}, model }); @@ -39,17 +40,17 @@ module.exports = { it('Has preview box', function() { var $asset = this.view.$el; - expect($asset.find('#preview').length).toEqual(1); + expect($asset.find('.preview').length).toEqual(1); }); it('Has meta box', function() { var $asset = this.view.$el; - expect($asset.find('#meta').length).toEqual(1); + expect($asset.find('.meta').length).toEqual(1); }); it('Has close button', function() { var $asset = this.view.$el; - expect($asset.find('#close').length).toEqual(1); + expect($asset.find('[data-toggle=asset-remove]').length).toEqual(1); }); }); @@ -72,7 +73,7 @@ module.exports = { it('Could be removed', function() { var spy = sinon.spy(); this.view.model.on("remove", spy); - this.view.$el.find('#close').trigger('click'); + this.view.$el.find('[data-toggle=asset-remove]').trigger('click'); expect(spy.called).toEqual(true); }); diff --git a/test/specs/asset_manager/view/AssetsView.js b/test/specs/asset_manager/view/AssetsView.js index 07922d9ce..ae9677b06 100644 --- a/test/specs/asset_manager/view/AssetsView.js +++ b/test/specs/asset_manager/view/AssetsView.js @@ -1,4 +1,5 @@ var AssetsView = require('asset_manager/view/AssetsView'); +var FileUploader = require('asset_manager/view/FileUploader'); var Assets = require('asset_manager/model/Assets'); module.exports = { @@ -14,10 +15,12 @@ module.exports = { }); beforeEach(function () { - this.coll = new Assets([]); + this.coll = new Assets([]); this.view = new AssetsView({ - config : {}, - collection: this.coll + config: {}, + collection: this.coll, + globalCollection: new Assets([]), + fu: new FileUploader({}) }); obj = this.view; this.$fixture.empty().appendTo(this.$fixtures); @@ -85,7 +88,7 @@ module.exports = { obj.addFromStr({ preventDefault() {} }); - var asset = obj.collection.at(0); + var asset = obj.options.globalCollection.at(0); expect(asset.get('src')).toEqual('test'); });