Commit b4dc7e0f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige doble importación de IpGetter 

Se generaliza su importación y se usan los valores que devuelve sólo
para los tests remotos.
parent a6ac2b52

grunt/config/test.js

+6 −1
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ module.exports = function(grunt) { 
			testFunctionalRemotePath = path.join(absoluteTestsPath, 'intern-functional-remote'),

			dojoCommonBaseUrl = path.join(' ', srcPath, '*').trim(),



			ipGetterPath = path.join(absoluteTestsPath, 'IpGetter'),

			IpGetter = require(ipGetterPath)(),

			localIp = IpGetter.getIp(),



			testParams = {

				srcPath: srcPath,

				testsPath: testsPath,
@@ -99,7 +103,8 @@ module.exports = function(grunt) { 
			remoteTestParams = {

				ownServerHost: ownServerHost,

				remoteHost: remoteHost,

				remotePort: remotePort

				remotePort: remotePort,

				localIp: localIp

			},

			testUnitParams = deepmerge(testParams, {

				reporters: unitReporters,

tests/_remote.js

+2 −2
Original line number Diff line number Diff line 
module.exports = function(args) {



	var IpGetter = require('./IpGetter')(),

	var localIp = args.localIp,

		remoteHost = args.remoteHost || '127.0.0.1',

		remotePort = args.remotePort || '4444',

		remoteTunnel = remoteHost + ':' + remotePort,
@@ -10,7 +10,7 @@ module.exports = function(args) { 
		ownServerPort = args.ownServerPort;



	if (!ownServerHost || !ownServerHost.length) {

		ownServerHost = IpGetter.getIp();

		ownServerHost = localIp;

	}



	var ownServerUrl = 'http://' + ownServerHost + ':' + ownServerPort;