From 16186811a44d0fb86b2552468f0ac2e1571499d5 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 2 May 2015 19:45:01 +0200 Subject: [PATCH] Clean code. --- src/_h5ai/client/js/inc/core/server.js | 55 ++++------- src/_h5ai/client/js/inc/ext/thumbnails.js | 2 +- test/tests/unit/core/server.js | 114 +--------------------- 3 files changed, 26 insertions(+), 145 deletions(-) diff --git a/src/_h5ai/client/js/inc/core/server.js b/src/_h5ai/client/js/inc/core/server.js index d529b058..ff5c028d 100644 --- a/src/_h5ai/client/js/inc/core/server.js +++ b/src/_h5ai/client/js/inc/core/server.js @@ -1,54 +1,41 @@ -modulejs.define('core/server', ['_', '$', 'config', 'core/location'], function (_, $, config, location) { - - var hasApi = config.setup.API === true; - +modulejs.define('core/server', ['_', '$', 'core/location'], function (_, $, location) { function request(data, callback) { - if (hasApi) { - $.ajax({ - url: location.getAbsHref(), - data: data, - type: 'post', - dataType: 'json' - }) - .done(function (json) { + $.ajax({ + url: location.getAbsHref(), + data: data, + type: 'post', + dataType: 'json' + }) + .done(function (json) { - callback(json); - }) - .fail(function () { + callback(json); + }) + .fail(function () { - callback(); - }); - } else { callback(); - } + }); } function formRequest(data) { - if (hasApi) { - var $form = $('
') - .attr('action', location.getAbsHref()); + var $form = $('') + .attr('action', location.getAbsHref()); - _.each(data, function (val, key) { + _.each(data, function (val, key) { - $('') - .attr('name', key) - .attr('value', val) - .appendTo($form); - }); + $('') + .attr('name', key) + .attr('value', val) + .appendTo($form); + }); - $form.appendTo('body').submit().remove(); - } + $form.appendTo('body').submit().remove(); } return { - api: hasApi, - backend: config.setup.BACKEND, - name: config.setup.SERVER_NAME, - version: config.setup.SERVER_VERSION, request: request, formRequest: formRequest }; diff --git a/src/_h5ai/client/js/inc/ext/thumbnails.js b/src/_h5ai/client/js/inc/ext/thumbnails.js index 444b7f7f..05a11010 100644 --- a/src/_h5ai/client/js/inc/ext/thumbnails.js +++ b/src/_h5ai/client/js/inc/ext/thumbnails.js @@ -78,7 +78,7 @@ modulejs.define('ext/thumbnails', ['_', 'core/event', 'core/server', 'core/setti function init() { - if (!settings.enabled || !server.api) { + if (!settings.enabled) { return; } diff --git a/test/tests/unit/core/server.js b/test/tests/unit/core/server.js index a7424b5f..d93f3dff 100644 --- a/test/tests/unit/core/server.js +++ b/test/tests/unit/core/server.js @@ -2,7 +2,7 @@ 'use strict'; var ID = 'core/server'; -var DEPS = ['_', '$', 'config', 'core/location']; +var DEPS = ['_', '$', 'core/location']; var $submitEl; describe('module \'' + ID + '\'', function () { @@ -11,14 +11,6 @@ describe('module \'' + ID + '\'', function () { this.definition = modulejs._private.definitions[ID]; - this.xConfig = { - setup: { - API: true, - BACKEND: util.uniqId(), - SERVER_NAME: util.uniqId(), - SERVER_VERSION: util.uniqId() - } - }; this.xAbsHref = util.uniqId(); this.xLocation = { getAbsHref: sinon.stub().returns(this.xAbsHref) @@ -45,7 +37,7 @@ describe('module \'' + ID + '\'', function () { this.xSubmit.reset(); $submitEl = undefined; - return this.definition.fn(_, $, this.xConfig, this.xLocation); + return this.definition.fn(_, $, this.xLocation); }; }); @@ -90,69 +82,11 @@ describe('module \'' + ID + '\'', function () { describe('application', function () { - it('returns plain object with 6 properties', function () { + it('returns plain object with 2 properties', function () { var instance = this.applyFn(); assert.isPlainObject(instance); - assert.lengthOf(_.keys(instance), 6); - }); - }); - - describe('.backend', function () { - - it('set correct', function () { - - var instance = this.applyFn(); - assert.strictEqual(instance.backend, this.xConfig.setup.BACKEND); - }); - }); - - describe('.name', function () { - - it('set correct', function () { - - var instance = this.applyFn(); - assert.strictEqual(instance.name, this.xConfig.setup.SERVER_NAME); - }); - }); - - describe('.version', function () { - - it('set correct', function () { - - var instance = this.applyFn(); - assert.strictEqual(instance.version, this.xConfig.setup.SERVER_VERSION); - }); - }); - - describe('.api', function () { - - it('set correct (false)', function () { - - this.xConfig.setup.API = false; - var instance = this.applyFn(); - assert.isFalse(instance.api); - }); - - it('set correct (falsy)', function () { - - this.xConfig.setup.API = null; - var instance = this.applyFn(); - assert.isFalse(instance.api); - }); - - it('set correct (truthy)', function () { - - this.xConfig.setup.API = 1; - var instance = this.applyFn(); - assert.isFalse(instance.api); - }); - - it('set correct (true)', function () { - - this.xConfig.setup.API = true; - var instance = this.applyFn(); - assert.isTrue(instance.api); + assert.lengthOf(_.keys(instance), 2); }); }); @@ -164,29 +98,8 @@ describe('module \'' + ID + '\'', function () { assert.isFunction(instance.request); }); - it('no result if no API', function () { - - this.xConfig.setup.API = false; - - var instance = this.applyFn(); - - var xData = util.uniqObj(); - var spy = sinon.spy(); - var res = instance.request(xData, spy); - - assert.isUndefined(res); - assert.isFalse(this.xAjax.called); - assert.isFalse(this.xAjaxResult.done.called); - assert.isFalse(this.xAjaxResult.fail.called); - assert.isFalse(this.xAjax.called); - assert.isTrue(spy.calledOnce); - assert.deepEqual(spy.lastCall.args, []); - }); - it('done() works', function () { - this.xConfig.setup.API = true; - var instance = this.applyFn(); var xData = util.uniqObj(); @@ -215,8 +128,6 @@ describe('module \'' + ID + '\'', function () { it('fail() works', function () { - this.xConfig.setup.API = true; - var instance = this.applyFn(); var xData = util.uniqObj(); @@ -251,25 +162,8 @@ describe('module \'' + ID + '\'', function () { assert.isFunction(instance.formRequest); }); - it('does nothing if no API', function () { - - this.xConfig.setup.API = false; - - var instance = this.applyFn(); - - var xData = util.uniqObj(); - var res = instance.formRequest(xData); - - assert.isUndefined(res); - - assert.isFalse(this.xSubmit.called); - assert.isUndefined($submitEl); - }); - it('works', function () { - this.xConfig.setup.API = true; - var instance = this.applyFn(); var xData = {