1 files changed, 58 insertions, 1 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/service_spec.rb b/spec/lib/gitlab/ci/config/entry/service_spec.rb
index 1f935bebed5..82747e7b521 100644
--- a/spec/lib/gitlab/ci/config/entry/service_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/service_spec.rb
@@ -47,11 +47,23 @@ RSpec.describe Gitlab::Ci::Config::Entry::Service do
         expect(entry.ports).to be_nil
       end
     end
+
+    describe '#executor_opts' do
+      it "returns service's executor_opts configuration" do
+        expect(entry.executor_opts).to be_nil
+      end
+    end
   end
 
   context 'when configuration is a hash' do
     let(:config) do
-      { name: 'postgresql:9.5', alias: 'db', command: %w[cmd run], entrypoint: %w[/bin/sh run] }
+      {
+        name: 'postgresql:9.5',
+        alias: 'db',
+        command: %w[cmd run],
+        entrypoint: %w[/bin/sh run],
+        variables: { 'MY_VAR' => 'variable' }
+      }
     end
 
     describe '#valid?' do
@@ -141,6 +153,51 @@ RSpec.describe Gitlab::Ci::Config::Entry::Service do
       end
     end
 
+    context 'when configuration has docker options' do
+      let(:config) { { name: 'postgresql:9.5', docker: { platform: 'amd64' } } }
+
+      describe '#valid?' do
+        it 'is valid' do
+          expect(entry).to be_valid
+        end
+      end
+
+      describe '#value' do
+        it "returns value" do
+          expect(entry.value).to eq(
+            name: 'postgresql:9.5',
+            executor_opts: {
+              docker: { platform: 'amd64' }
+            }
+          )
+        end
+      end
+    end
+
+    context 'when docker options have an invalid property' do
+      let(:config) { { name: 'postgresql:9.5', docker: { invalid: 'option' } } }
+
+      describe '#valid?' do
+        it 'is not valid' do
+          expect(entry).not_to be_valid
+          expect(entry.errors.first)
+            .to match %r{service executor opts '/docker/invalid' must be a valid 'schema'}
+        end
+      end
+    end
+
+    context 'when docker options platform is not string' do
+      let(:config) { { name: 'postgresql:9.5', docker: { platform: 123 } } }
+
+      describe '#valid?' do
+        it 'is not valid' do
+          expect(entry).not_to be_valid
+          expect(entry.errors.first)
+            .to match %r{service executor opts '/docker/platform' must be a valid 'string'}
+        end
+      end
+    end
+
     context 'when configuration has pull_policy' do
       let(:config) { { name: 'postgresql:9.5', pull_policy: 'if-not-present' } }