diff --git a/Gruntfile.js b/Gruntfile.js index cd1faa113f..573d945eff 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,7 +7,10 @@ module.exports = function(grunt) { }, mocha_phantomjs: { options: { - 'reporter': 'dot' + 'reporter': 'dot', + 'setting': [ + 'loadImages=false' + ] }, all: ['www/scripts/tests/index.html'] }, diff --git a/www/scripts/apps/admin/fields/app.js b/www/scripts/apps/admin/fields/app.js index 0f349d8298..171833991b 100644 --- a/www/scripts/apps/admin/fields/app.js +++ b/www/scripts/apps/admin/fields/app.js @@ -20,8 +20,8 @@ define([ "apps/admin/fields/views/fieldError", "apps/admin/fields/errors/errorManager" ], function ($, _, Backbone, i18n, FieldsCollection, VocabulariesCollection, DcFieldsCollection, FieldListView, SaveView, FieldErrorView, ErrorManager) { - var initialize = function () { - AdminFieldApp = { + var create = function () { + window.AdminFieldApp = { $window: $(window), $scope: $("#admin-field-app"), $top: $(".row-top", this.$scope), @@ -58,7 +58,9 @@ define([ }); AdminFieldApp.vocabularyCollection = new VocabulariesCollection(); AdminFieldApp.dcFieldsCollection = new DcFieldsCollection(); + }; + var load = function() { // load strings i18n.init({resGetPath: "/admin/fields/language.json"}); @@ -101,7 +103,14 @@ define([ ); }; + var initialize = function () { + create(); + load(); + }; + return { + create: create, + load: load, initialize: initialize }; }); diff --git a/www/scripts/tests/specs/admin/fields.js b/www/scripts/tests/specs/admin/fields.js index 906dc7fe5b..9023f35902 100644 --- a/www/scripts/tests/specs/admin/fields.js +++ b/www/scripts/tests/specs/admin/fields.js @@ -25,7 +25,7 @@ define([ $("body").append(fixtures.read('admin/fields/dom', 'admin/fields/templates')); var sbasId = 1; - App.initialize(); + App.create(); describe("Admin field", function () { describe("Initialization", function () {