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

Corrige detalles de testeo, aplica cambios a CI 

Actualiza a última versión de selenium driver.
Corrige valores estáticos y parámetros faltantes.
parent 90cdfdcb

.gitlab-ci.yml

+91 −22
Original line number Diff line number Diff line
@@ -65,27 +65,93 @@ prepare-unbuilt-version: 
      - public/stylesheets/submodules/

  rules: *only-non-master-branches-job-rules



#run-unit-tests:

#  extends: .web-build

#  stage: pre-build

#  script:

#    - grunt test | tee test.out

#    - coverage=$(grep '^All files.*' test.out | cut -d '|' -f 2 | tr -d ' ')

#    - echo "Coverage - ${coverage}%"

#    - rm test.out

#  cache:

#    policy: pull

#  rules: *only-non-master-branches-job-rules

#

#run-modules-functional-tests:

#  extends: .web-build

#  stage: pre-build

#  script:

#    - npm start &

#    - grunt test-functional-local --functionalSuites=tests/functional/modules/**/!\(*Script\).js --headless

#  cache:

#    policy: pull

#  rules: *only-non-master-branches-job-rules

.run-unit-tests:

  extends: .web-build

  stage: pre-build

  script:

    - grunt test --headless --browser=${TEST_BROWSER} | tee test.out

    - coverage=$(grep '^All files.*' test.out | cut -d '|' -f 2 | tr -d ' ')

    - echo "Coverage - ${coverage}%"

    - rm test.out

  cache:

    policy: pull

  rules: *only-non-master-branches-job-rules



.run-remote-unit-tests:

  extends: .web-build

  stage: pre-build

  variables:

    TEST_REMOTE_HOST: selenium-hub

  script:

    - grunt test-unit-remote --headless --browser=${TEST_BROWSER} --remoteHost=${TEST_REMOTE_HOST} | tee test.out

    - coverage=$(grep '^All files.*' test.out | cut -d '|' -f 2 | tr -d ' ')

    - echo "Coverage - ${coverage}%"

    - rm test.out

  cache:

    policy: pull

  rules: *only-non-master-branches-job-rules



run-unit-tests-chrome:

  extends: .run-unit-tests

  variables:

    TEST_BROWSER: chrome



run-unit-tests-firefox:

  extends: .run-unit-tests

  variables:

    TEST_BROWSER: firefox



run-remote-unit-tests-chrome:

  extends: .run-remote-unit-tests

  variables:

    TEST_BROWSER: chrome



run-remote-unit-tests-firefox:

  extends: .run-remote-unit-tests

  variables:

    TEST_BROWSER: firefox



.run-modules-functional-tests:

  extends: .web-build

  stage: pre-build

  script:

    - npm start &

    - grunt test-functional-local --functionalSuites=tests/functional/modules/**/!\(*Script\).js --headless --browser=${TEST_BROWSER}

  cache:

    policy: pull

  rules: *only-non-master-branches-job-rules



.run-remote-modules-functional-tests:

  extends: .web-build

  stage: pre-build

  variables:

    TEST_REMOTE_HOST: selenium-hub

  script:

    - npm start &

    - grunt test-functional-local --functionalSuites=tests/functional/modules/**/!\(*Script\).js --headless --browser=${TEST_BROWSER} --remoteHost=${TEST_REMOTE_HOST}

  cache:

    policy: pull

  rules: *only-non-master-branches-job-rules



run-modules-functional-tests-chrome:

  extends: .run-modules-functional-tests

  variables:

    TEST_BROWSER: chrome



run-modules-functional-tests-firefox:

  extends: .run-modules-functional-tests

  variables:

    TEST_BROWSER: firefox



run-remote-modules-functional-tests-chrome:

  extends: .run-remote-modules-functional-tests

  variables:

    TEST_BROWSER: chrome



run-remote-modules-functional-tests-firefox:

  extends: .run-remote-modules-functional-tests

  variables:

    TEST_BROWSER: firefox



prepare-built-version:

  extends: .web-build
@@ -113,10 +179,13 @@ prepare-built-version: 
run-functional-tests:

  extends: .web-build

  stage: test-deploy

  variables:

    TEST_REMOTE_HOST: selenium-hub

  script:

    - >

      grunt test-functional-local --serverUrl="https://${DEV_PUBLIC_HOSTNAME}" --user="${REDMIC_TEST_USER}"

      --pass="${REDMIC_TEST_PASS}" --role=administrator --suitesGroups="${SUITES_GROUPS}" --headless

      --pass="${REDMIC_TEST_PASS}" --role=administrator --suitesGroups="${SUITES_GROUPS}" --headless --browser=chrome

      --browser=firefox --remoteHost=${TEST_REMOTE_HOST}

  dependencies: []

  cache:

    policy: pull

grunt/config/test.js

+5 −6
Original line number Diff line number Diff line
@@ -93,14 +93,16 @@ module.exports = function(grunt) { 
				ownTunnelPort: ownTunnelPort,

				suitesGroups: suitesGroups,

				browser: browser,

				headless: headless

				headless: headless,

				userDataDir: userDataDir,

				remoteHost: remoteHost,

				remotePort: remotePort

			},

			testUnitParams = deepmerge(testParams, {

				reporters: unitReporters,

				suites: suites,

				coverage: coverage,

				dojoBaseUrl: dojoCommonBaseUrl,

				userDataDir: userDataDir

			}),

			testFunctionalParams = deepmerge(testParams, {

				serverUrl: serverUrl,
@@ -110,10 +112,7 @@ module.exports = function(grunt) { 
				reporters: functionalReporters,

				functionalSuites: functionalSuites,

				reportersOutputPath: reportersOutputPath,

				dojoBaseUrl: '.' + dojoCommonBaseUrl,

				userDataDir: userDataDir,

				remoteHost: remoteHost,

				remotePort: remotePort

				dojoBaseUrl: '.' + dojoCommonBaseUrl

			}),



			testUnitLocalOptions = require(testUnitLocalPath)(testUnitParams),

tests/_environments.js

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ module.exports = function(args) { 
	var headless = args.headless,

		browser = args.browser,

		browserList = typeof browser === 'string' ? browser.split(',') : browser,

		userDataDir = args.userDataDir || '.config',

		//userDataDir = args.userDataDir || '.config',

		windowWidth = 1280,

		windowHeight = 768,

		environments = [];
@@ -15,7 +15,7 @@ module.exports = function(args) { 
				args: [

					'disable-extensions',

					'window-size=' + windowWidth + ',' + windowHeight,

					'user-data-dir=' + userDataDir

					//'user-data-dir=' + userDataDir

				]

			}

		},

tests/_intern.js

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ module.exports = function(args) { 
		socketPort: socketPort,



		tunnelOptions: {

			version: '3.141.59',

			version: '4.0.0-alpha-2',

			port: tunnelPort,

			drivers: [{

				name: 'chrome',

tests/functional/modules/components/Keypad/testKeypad.js

+3 −3
Original line number Diff line number Diff line
@@ -23,17 +23,17 @@ define([ 


		pressButtonAndListen = function(buttonSelector, buttonKey) {



			return lang.partial(function(buttonSelector, buttonKey) {

			return lang.partial(function(buttonSelector1, buttonKey1) {



				return this.parent

					.then(Utils.clickElement(buttonSelector))

					.then(Utils.clickElement(buttonSelector1))

					.then(pollUntil(function() {



						return window.inputKey;

					}, timeout))

					.then(function(inputKey) {



						assert.strictEqual(inputKey, buttonKey,

						assert.strictEqual(inputKey, buttonKey1,

							'Se ha publicado una pulsación de botón diferente al pulsado');

					}, function(error) {