Commit 8318acda authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige rutas desactualizadas

parent 1103720b

.gitlab-ci/build.yml

+6 −6
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
  cache:

    paths:

      - node_modules/

      - public/javascript/templates/node_modules/

      - public/stylesheets/node_modules/

      - client-app/javascript/templates/node_modules/

      - client-app/stylesheets/node_modules/



prepare-unbuilt-version:

  extends: .web-build
@@ -26,10 +26,10 @@ prepare-unbuilt-version: 
    expire_in: 1 week

    paths:

      - node_modules/

      - public/javascript/templates/dist/

      - public/stylesheets/style.styl

      - public/stylesheets/src/

      - public/stylesheets/submodules/

      - client-app/javascript/templates/dist/

      - client-app/stylesheets/style.styl

      - client-app/stylesheets/src/

      - client-app/stylesheets/submodules/

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

client-app/tests/support/pages/test.html

+3 −3
Original line number Diff line number Diff line
@@ -4,18 +4,18 @@ 
	<head>

		<meta charset="utf-8">

		<title>Test page</title>

		<link rel="stylesheet" type="text/css" href="/public/stylesheets/style.css">

		<link rel="stylesheet" type="text/css" href="/client-app/stylesheets/style.css">

	</head>



	<body class="db">

		<script src="/public/javascript/dojoConfig.js"></script>

		<script src="/client-app/javascript/dojoConfig.js"></script>

		<script>

			dojoConfig.packages.push({

				name: 'tests',

				location: '../../../tests'

			});

		</script>

		<script src="/public/javascript/dojo/dojo.js"></script>

		<script src="/client-app/javascript/dojo/dojo.js"></script>



		<div style="margin: 20px; height: calc(100% - 40px)">

			<div id="container"></div>

grunt/config/jshint.js

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ module.exports = function(grunt) { 
				src: [

					srcPath + '/app/**/*.js'

					, srcPath + '/redmic/**/*.js'

					, 'app/**/*.js'

					, 'server-app/**/*.js'

					, 'grunt/**/*.js'

					, '*.js'

				]

grunt/config/test.js

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ module.exports = function(grunt) { 


			rootPath = grunt.config('redmicConfig.rootPath'),

			srcPath = grunt.config('redmicConfig.srcPath'),

			testsPath = 'tests',

			testsPath = 'client-app/tests',

			outputPath = 'test_reports',



			ownServerHost = grunt.option('ownServerHost') || '',