From 24c37374002f4bd80577f236dec1e22a5c740330 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Thu, 1 Jun 2017 02:23:43 +0200 Subject: [PATCH] Done with asset manager tests --- test/specs/asset_manager/view/AssetImageView.js | 6 +++--- test/specs/asset_manager/view/AssetView.js | 4 ++-- test/specs/asset_manager/view/AssetsView.js | 1 - test/specs/asset_manager/view/FileUploader.js | 16 ++++++++-------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/test/specs/asset_manager/view/AssetImageView.js b/test/specs/asset_manager/view/AssetImageView.js index ece07be89..540d3bb84 100644 --- a/test/specs/asset_manager/view/AssetImageView.js +++ b/test/specs/asset_manager/view/AssetImageView.js @@ -39,17 +39,17 @@ module.exports = { it('Has preview box', function() { var $asset = this.view.$el; - expect($asset.find('#preview').get(0).length).toEqual(1); + expect($asset.find('#preview').length).toEqual(1); }); it('Has meta box', function() { var $asset = this.view.$el; - expect($asset.find('#meta').get(0).length).toEqual(1); + expect($asset.find('#meta').length).toEqual(1); }); it('Has close button', function() { var $asset = this.view.$el; - expect($asset.find('#close').get(0).length).toEqual(1); + expect($asset.find('#close').length).toEqual(1); }); }); diff --git a/test/specs/asset_manager/view/AssetView.js b/test/specs/asset_manager/view/AssetView.js index c31dfa381..a186912d2 100644 --- a/test/specs/asset_manager/view/AssetView.js +++ b/test/specs/asset_manager/view/AssetView.js @@ -32,11 +32,11 @@ module.exports = { }); it('Object exists', function() { - AssetView.should.be.exist; + expect(AssetView).toExist(); }); it('Has correct prefix', function() { - this.view.pfx.should.equal(''); + expect(this.view.pfx).toEqual(''); }); }); diff --git a/test/specs/asset_manager/view/AssetsView.js b/test/specs/asset_manager/view/AssetsView.js index a03fd0c79..87f3f3ef7 100644 --- a/test/specs/asset_manager/view/AssetsView.js +++ b/test/specs/asset_manager/view/AssetsView.js @@ -54,7 +54,6 @@ module.exports = { it("Render correctly new image asset", function (){ this.coll.add({ type: 'image', src: 'test'}); var asset = this.view.getAssetsEl().firstChild; - asset.tagName.should.equal('DIV'); expect(asset.tagName).toEqual('DIV'); expect(asset.innerHTML).toExist(); }); diff --git a/test/specs/asset_manager/view/FileUploader.js b/test/specs/asset_manager/view/FileUploader.js index 528db80d4..551a839c2 100644 --- a/test/specs/asset_manager/view/FileUploader.js +++ b/test/specs/asset_manager/view/FileUploader.js @@ -25,29 +25,29 @@ module.exports = { }); it('Object exists', function() { - FileUploader.should.be.exist; + expect(FileUploader).toExist(); }); it('Has correct prefix', function() { - this.view.pfx.should.equal(''); + expect(this.view.pfx).toNotExist(); }); describe('Should be rendered correctly', function() { it('Has title', function() { - this.view.$el.find('#title').should.have.property(0); + expect(this.view.$el.find('#title').length).toEqual(1); }); it('Title is empty', function() { - this.view.$el.find('#title').html().should.equal(''); + expect(this.view.$el.find('#title').html()).toEqual(''); }); it('Has file input', function() { - this.view.$el.find('input[type=file]').should.have.property(0); + expect(this.view.$el.find('input[type=file]').length).toEqual(1); }); it('File input is enabled', function() { - this.view.$el.find('input[type=file]').prop('disabled').should.equal(true); + expect(this.view.$el.find('input[type=file]').prop('disabled')).toEqual(true); }); }); @@ -59,7 +59,7 @@ module.exports = { uploadText : 'Test', } }); view.render(); - view.$el.find('#title').html().should.equal('Test'); + expect(view.$el.find('#title').html()).toEqual('Test'); }); it('Could be disabled', function() { @@ -67,7 +67,7 @@ module.exports = { disableUpload: true, } }); view.render(); - view.$el.find('input[type=file]').prop('disabled').should.equal(true); + expect(view.$el.find('input[type=file]').prop('disabled')).toEqual(true); }); });