8
0
فهرست منبع

Merge branch 't/166'.

Piotrek Koszuliński 9 سال پیش
والد
کامیت
78d789ea98
3فایلهای تغییر یافته به همراه6 افزوده شده و 42 حذف شده
  1. 5 12
      dev/tasks/build/utils.js
  2. 1 2
      tests/.jshintrc
  3. 0 28
      tests/_utils-tests/benderglobals.js

+ 5 - 12
dev/tasks/build/utils.js

@@ -32,18 +32,11 @@ const utils = {
 	 */
 	benderLauncherCode:
 `
-	var defer = bender.defer();
-	require( [ 'tests', '/tests/engine/_utils/view.js', '/tests/engine/_utils/model.js' ], 
-	function( tests, view, model ) { 
-		bender.view = view;
-		bender.model = model;
-		defer();
-	}, 
-	function( err ) {
-		// The problem with Require.JS is that there are no stacktraces if we won't log this.
-		console.error( err );
-		console.log( err.stack );
-	} );
+require( [ 'tests' ], bender.defer(), function( err ) {
+	// The problem with Require.JS is that there are no stacktraces if we won't log this.
+	console.error( err );
+	console.log( err.stack );
+} );
 `,
 
 	/**

+ 1 - 2
tests/.jshintrc

@@ -20,7 +20,6 @@
 		"describe": false,
 		"expect": false,
 		"it": false,
-		"sinon": false,
-		"bender": false
+		"sinon": false
 	}
 }

+ 0 - 28
tests/_utils-tests/benderglobals.js

@@ -1,28 +0,0 @@
-/**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
- */
-
-'use strict';
-
-describe( 'bender global utils', () => {
-	describe( 'view', () => {
-		it( 'should be published in bender object', () => {
-			expect( bender.view ).to.be.an( 'object' );
-			expect( bender.view ).to.have.property( 'getData' ).that.is.a( 'function' );
-			expect( bender.view ).to.have.property( 'setData' ).that.is.a( 'function' );
-			expect( bender.view ).to.have.property( 'parse' ).that.is.a( 'function' );
-			expect( bender.view ).to.have.property( 'stringify' ).that.is.a( 'function' );
-		} );
-	} );
-
-	describe( 'model', () => {
-		it( 'should be published in bender object', () => {
-			expect( bender.model ).to.be.an( 'object' );
-			expect( bender.model ).to.have.property( 'getData' ).that.is.a( 'function' );
-			expect( bender.model ).to.have.property( 'setData' ).that.is.a( 'function' );
-			expect( bender.model ).to.have.property( 'parse' ).that.is.a( 'function' );
-			expect( bender.model ).to.have.property( 'stringify' ).that.is.a( 'function' );
-		} );
-	} );
-} );