From bb089dfa424cefc64e65f1dd2aab5fe8fe1dad16 Mon Sep 17 00:00:00 2001 From: carlfeberhard Date: Mon, 16 Nov 2015 10:53:30 -0500 Subject: [PATCH] Tests, qunit: fix import of underscore from libs, fix galaxy-app-base to not require config but have it passed in --- client/galaxy/scripts/galaxy-app-base.js | 5 +-- static/maps/galaxy-app-base.js.map | 2 +- test/qunit/test-common.js | 5 ++- test/qunit/tests/galaxy-app-base.js | 41 +++++++++++------------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/client/galaxy/scripts/galaxy-app-base.js b/client/galaxy/scripts/galaxy-app-base.js index 26c2a5279e2..6e736c91488 100644 --- a/client/galaxy/scripts/galaxy-app-base.js +++ b/client/galaxy/scripts/galaxy-app-base.js @@ -139,7 +139,9 @@ GalaxyApp.prototype._initLogger = function _initLogger( loggerOptions ){ self.logger = new metricsLogger.MetricsLogger( loggerOptions ); self.emit = {}; [ 'log', 'debug', 'info', 'warn', 'error', 'metric' ].map(function( i ) { - self.emit[ i ] = function( data ) { self.logger.emit( i, arguments[ 0 ], Array.prototype.slice.call( arguments, 1 ) ) }; + self.emit[ i ] = function( data ){ + self.logger.emit( i, arguments[ 0 ], Array.prototype.slice.call( arguments, 1 ) ); + }; }); if( self.config.debug ){ @@ -246,7 +248,6 @@ GalaxyApp.prototype.toString = function toString(){ return 'GalaxyApp(' + userEmail + ')'; }; - // ============================================================================ return { GalaxyApp : GalaxyApp diff --git a/static/maps/galaxy-app-base.js.map b/static/maps/galaxy-app-base.js.map index 6fc2b14ac67..09073e544b1 100644 --- a/static/maps/galaxy-app-base.js.map +++ b/static/maps/galaxy-app-base.js.map @@ -1 +1 @@ -{"version":3,"file":"galaxy-app-base.js","sources":["../src/galaxy-app-base.js"],"names":["define","_","Backbone","BASE_MVC","userModel","metricsLogger","addLogging","localize","GalaxyApp","options","bootstrapped","self","this","_init","DEBUGGING_KEY","NAMESPACE_KEY","localDebugging","localStorage","getItem","storageErr","console","log","prototype","extend","Events","logger","debug","_processOptions","root","_initConfig","config","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","_initLocale","_initUser","user","_setUpListeners","trigger","defaultOptions","patchExisting","defaults","k","hasOwnProperty","patchWith","consoleLogger","consoleLevel","MetricsLogger","ALL","consoleNamespaceWhitelist","split","emit","map","i","arguments","Array","slice","call","LoggableMixin","_l","userJSON","User","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","debugging","setting","undefined","setItem","removeItem","debuggingNamespaces","namespaces","csv","newSettings","toString","userEmail","get"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"galaxy-app-base.js","sources":["../src/galaxy-app-base.js"],"names":["define","_","Backbone","BASE_MVC","userModel","metricsLogger","addLogging","localize","GalaxyApp","options","bootstrapped","self","this","_init","DEBUGGING_KEY","NAMESPACE_KEY","localDebugging","localStorage","getItem","storageErr","console","log","prototype","extend","Events","logger","debug","_processOptions","root","_initConfig","config","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","_initLocale","_initUser","user","_setUpListeners","trigger","defaultOptions","patchExisting","defaults","k","hasOwnProperty","patchWith","consoleLogger","consoleLevel","MetricsLogger","ALL","consoleNamespaceWhitelist","split","emit","map","i","arguments","Array","slice","call","LoggableMixin","_l","userJSON","User","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","debugging","setting","undefined","setItem","removeItem","debuggingNamespaces","namespaces","csv","newSettings","toString","userEmail","get"],"mappings":"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"} \ No newline at end of file diff --git a/test/qunit/test-common.js b/test/qunit/test-common.js index 32265097653..a9f35dec5da 100644 --- a/test/qunit/test-common.js +++ b/test/qunit/test-common.js @@ -38,6 +38,9 @@ require.config({ "underscore": { exports: "_" }, + "libs/underscore": { + exports: "_" + }, "backbone": { deps: [ 'libs/underscore', 'jquery' ], exports: "Backbone" @@ -90,7 +93,7 @@ function bridge_phantomjs( QUnit ) { var args = [].slice.call(arguments); alert(JSON.stringify(args)); } - + // These methods connect QUnit to PhantomJS. QUnit.log(function(obj) { // What is this I don’t even diff --git a/test/qunit/tests/galaxy-app-base.js b/test/qunit/tests/galaxy-app-base.js index de4804e9427..b560995c254 100644 --- a/test/qunit/tests/galaxy-app-base.js +++ b/test/qunit/tests/galaxy-app-base.js @@ -1,6 +1,19 @@ -define( 'bootstrapped-data', function(){ - return { - config : { +define([ + "galaxy-app-base", + "jquery", + "sinon-qunit" +], function( + appBase, + $, + sinon +){ + /*globals equal test module expect deepEqual strictEqual throws ok */ + "use strict"; + + module( "Galaxy client app tests" ); + + var options = { + config : { "allow_user_deletion": false, "allow_user_creation": true, "wiki_url": "https://wiki.galaxyproject.org/", @@ -15,7 +28,7 @@ define( 'bootstrapped-data', function(){ "logo_url": null, "enable_unique_workflow_defaults": false }, - user : { + user : { "username": "test", "quota_percent": null, "total_disk_usage": 61815527, @@ -28,22 +41,6 @@ define( 'bootstrapped-data', function(){ "id": "f2db41e1fa331b3e" } }; -}); -define([ - "galaxy-app-base", - 'bootstrapped-data', - "jquery", - "sinon-qunit" -], function( - appBase, - bootstrapped, - $, - sinon -){ - /*globals equal test module expect deepEqual strictEqual throws ok */ - "use strict"; - - module( "Galaxy client app tests" ); test( "App base construction/initializiation defaults", function() { var app = new appBase.GalaxyApp({}); @@ -53,6 +50,7 @@ define([ ok( app.hasOwnProperty( 'config' ) && typeof app.config === 'object' ); ok( app.hasOwnProperty( 'user' ) && typeof app.config === 'object' ); + // equal( true ); equal( app.localize, window._l ); }); @@ -94,7 +92,7 @@ define([ }); test( "App base config", function() { - var app = new appBase.GalaxyApp({}); + var app = new appBase.GalaxyApp( options ); ok( app.hasOwnProperty( 'config' ) && typeof app.config === 'object' ); equal( app.config.allow_user_deletion, false ); equal( app.config.allow_user_creation, true ); @@ -106,7 +104,6 @@ define([ test( "App base user", function() { var app = new appBase.GalaxyApp({}); ok( app.hasOwnProperty( 'user' ) && typeof app.user === 'object' ); - ok( app.hasOwnProperty( 'currUser' ) && app.user === app.currUser ); ok( app.user.isAdmin() === false ); });