Working directory validation on SPA. (#1727)

varshavaradarajan · varshavaradarajan · commit 1a345c09c45c · 2016-09-28T09:53:24.000+05:30
diff --git a/server/webapp/WEB-INF/rails.new/app/assets/new_javascripts/views/pipeline_configs/task_basic_views_widget.js.msx b/server/webapp/WEB-INF/rails.new/app/assets/new_javascripts/views/pipeline_configs/task_basic_views_widget.js.msx
@@ -44,6 +44,7 @@ define([
               <f.inputWithLabel attrName='workingDirectory'
                                 model={task}
                                 end={true}
+                                validate={true}
                                 tooltip={{
                                   content: tt.task.ant.workingDirectory,
                                   direction: 'bottom',
@@ -78,6 +79,7 @@ define([
               <f.inputWithLabel attrName='workingDirectory'
                                 model={task}
                                 end={true}
+                                validate={true}
                                 tooltip={{
                                   content: tt.task.nant.workingDirectory,
                                   direction: 'bottom',
@@ -143,6 +145,7 @@ define([
                   <f.inputWithLabel attrName='workingDirectory'
                                     model={task}
                                     end={true}
+                                    validate={true}
                                     size={12}
                                     largeSize={12}
                                     tooltip={{
@@ -183,6 +186,7 @@ define([
               <f.inputWithLabel attrName='workingDirectory'
                                 model={task}
                                 end={true}
+                                validate={true}
                                 tooltip={{
                                   content: tt.task.rake.workingDirectory,
                                   direction: 'bottom',
diff --git a/server/webapp/WEB-INF/rails.new/app/presenters/api_v3/config/tasks/ant_task_representer.rb b/server/webapp/WEB-INF/rails.new/app/presenters/api_v3/config/tasks/ant_task_representer.rb
@@ -20,7 +20,6 @@ module Tasks
       class AntTaskRepresenter < ApiV3::Config::Tasks::BaseTaskRepresenter
         alias_method :task, :represented
         ERROR_KEYS = {
-          'workingDirectory' => 'working_directory',
           'buildFile'        => 'build_file',
           'onCancelConfig'   => 'on_cancel',
           'runIf'            => 'run_if',
diff --git a/server/webapp/WEB-INF/rails.new/app/presenters/api_v3/config/tasks/exec_task_representer.rb b/server/webapp/WEB-INF/rails.new/app/presenters/api_v3/config/tasks/exec_task_representer.rb
@@ -20,7 +20,6 @@ module Tasks
       class ExecTaskRepresenter < ApiV3::Config::Tasks::BaseTaskRepresenter
         alias_method :task, :represented
         ERROR_KEYS = {
-          "workingDirectory" => "working_directory",
           "buildFile"        => "build_file",
           "onCancelConfig"   => "on_cancel",
           "runIf"            => "run_if",
diff --git a/server/webapp/WEB-INF/rails.new/app/presenters/api_v3/config/tasks/nant_task_representer.rb b/server/webapp/WEB-INF/rails.new/app/presenters/api_v3/config/tasks/nant_task_representer.rb
@@ -20,7 +20,6 @@ module Tasks
       class NantTaskRepresenter < ApiV3::Config::Tasks::BaseTaskRepresenter
         alias_method :task, :represented
         ERROR_KEYS = {
-          'workingDirectory' => 'working_directory',
           'buildFile'        => 'build_file',
           'onCancelConfig'   => 'on_cancel',
           'runIf'            => 'run_if',
diff --git a/server/webapp/WEB-INF/rails.new/app/presenters/api_v3/config/tasks/rake_task_representer.rb b/server/webapp/WEB-INF/rails.new/app/presenters/api_v3/config/tasks/rake_task_representer.rb
@@ -20,7 +20,6 @@ module Tasks
       class RakeTaskRepresenter < ApiV3::Config::Tasks::BaseTaskRepresenter
         alias_method :task, :represented
         ERROR_KEYS = {
-          'workingDirectory' => 'working_directory',
           'buildFile'        => 'build_file',
           'onCancelConfig'   => 'on_cancel',
           'runIf'            => 'run_if'
diff --git a/server/webapp/WEB-INF/rails.new/spec/presenters/api_v3/config/task_representer_spec.rb b/server/webapp/WEB-INF/rails.new/spec/presenters/api_v3/config/task_representer_spec.rb
@@ -131,7 +131,7 @@ def errors_hash
           attributes: { run_if: [], on_cancel: nil, command: "", working_directory: "../outside"},
           errors: {
             command: ["Command cannot be empty"],
-            working_directory: ["The path of the working directory for the custom command in job 'dev' in stage 'stage' of pipeline 'this_pipeline' is outside the agent sandbox."]
+            workingDirectory: ["The path of the working directory for the custom command in job 'dev' in stage 'stage' of pipeline 'this_pipeline' is outside the agent sandbox."]
           }
       }
     end
@@ -183,7 +183,7 @@ def errors_hash
           type:       'ant',
           attributes: { run_if: [], on_cancel: nil, working_directory: "../outside", build_file: nil, target: nil},
           errors: {
-            working_directory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]
+            workingDirectory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]
           }
       }
     end
@@ -236,7 +236,7 @@ def errors_hash
           type:       'nant',
           attributes: { run_if: [], on_cancel: nil, working_directory: "../outside", build_file: nil, target: nil, nant_path:nil},
           errors: {
-            working_directory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]
+            workingDirectory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]
           }
       }
     end
@@ -288,7 +288,7 @@ def errors_hash
           type:       'rake',
           attributes: {run_if: [], on_cancel: nil, working_directory: "../outside", build_file: nil, target: nil},
           errors: {
-            working_directory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]
+            workingDirectory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]
           }
 
       }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ def errors_hash`
`131`	`131`	`attributes: { run_if: [], on_cancel: nil, command: "", working_directory: "../outside"},`
`132`	`132`	`errors: {`
`133`	`133`	`command: ["Command cannot be empty"],`
`134`		`- working_directory: ["The path of the working directory for the custom command in job 'dev' in stage 'stage' of pipeline 'this_pipeline' is outside the agent sandbox."]`
	`134`	`+ workingDirectory: ["The path of the working directory for the custom command in job 'dev' in stage 'stage' of pipeline 'this_pipeline' is outside the agent sandbox."]`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`end`
`@@ -183,7 +183,7 @@ def errors_hash`
`183`	`183`	`type: 'ant',`
`184`	`184`	`attributes: { run_if: [], on_cancel: nil, working_directory: "../outside", build_file: nil, target: nil},`
`185`	`185`	`errors: {`
`186`		`- working_directory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]`
	`186`	`+ workingDirectory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`end`
`@@ -236,7 +236,7 @@ def errors_hash`
`236`	`236`	`type: 'nant',`
`237`	`237`	`attributes: { run_if: [], on_cancel: nil, working_directory: "../outside", build_file: nil, target: nil, nant_path:nil},`
`238`	`238`	`errors: {`
`239`		`- working_directory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]`
	`239`	`+ workingDirectory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`end`
`@@ -288,7 +288,7 @@ def errors_hash`
`288`	`288`	`type: 'rake',`
`289`	`289`	`attributes: {run_if: [], on_cancel: nil, working_directory: "../outside", build_file: nil, target: nil},`
`290`	`290`	`errors: {`
`291`		`- working_directory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]`
	`291`	`+ workingDirectory: ["Task of job 'dev' in stage 'stage' of pipeline 'this_pipeline' has path '../outside' which is outside the working directory."]`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`}`