Add latest changes from gitlab-org/gitlab@master

1 files changed, 32 insertions, 0 deletions

diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index 5de813f7739..fee3731c662 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -870,6 +870,38 @@ module Gitlab
             end
           end
         end
+
+        describe "hooks" do
+          context 'when it is a simple script' do
+            let(:config) do
+              {
+                test: { script: ["script"],
+                        hooks: { pre_get_sources_script: ["echo 1", "echo 2", "pwd"] } }
+              }
+            end
+
+            it "returns hooks in options" do
+              expect(subject[:options][:hooks]).to eq(
+                { pre_get_sources_script: ["echo 1", "echo 2", "pwd"] }
+              )
+            end
+          end
+
+          context 'when it is nested arrays of strings' do
+            let(:config) do
+              {
+                test: { script: ["script"],
+                        hooks: { pre_get_sources_script: [[["global script"], "echo 1"], "echo 2", ["ls"], "pwd"] } }
+              }
+            end
+
+            it "returns hooks in options" do
+              expect(subject[:options][:hooks]).to eq(
+                { pre_get_sources_script: ["global script", "echo 1", "echo 2", "ls", "pwd"] }
+              )
+            end
+          end
+        end
       end
 
       describe "Image and service handling" do