Commit 340214ef authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'hotfix-FileUploadTests' into 'master' 

Hotfix file upload tests

See merge request redmic-project/client/web!45
parents 1b42b5ac 3c94a178

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.16.1",

  "version": "0.16.2",

  "author": "REDMIC",

  "homepage": "https://gitlab.com/redmic-project/client/web/blob/master/README.md",

  "description": "Integrated marine data repository of Canary Islands - Client",

tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js

+8 −1
Original line number Diff line number Diff line 
require([

	'dojo/_base/declare'

	, 'dojo/Deferred'

	, 'dojo/dom'

	, 'redmic/modules/form/input/UploadFileImpl'

], function(

	declare

	, Deferred

	, dom

	, UploadFileImpl

){



	env = new Deferred();

	env.resolve({

		apiUrl: '/api'

	});



	var input = new UploadFileImpl({

		parentChannel: 'test',

		inputProps: {

			url: '/api/save',

			url: '{apiUrl}/save',

			maxFiles: 1,

			acceptedFiles: 'image/*'

		}

tests/unit/redmic/form/testUploadInput.js

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ define([ 
	, UploadInput

){

	var timeout = 100,

		saveUrl = '/{apiUrl}/save',

		saveUrl = '{apiUrl}/save',

		fileUrlParams = '?token=1234',

		files, prevFileUrl, input;