Merge branch '64731-fix-project-auto-devops-api' into 'master'

Fix the project auto devops API

See merge request gitlab-org/gitlab-ce!30946

(cherry picked from commit a85a233ffc5a8a06de16fd2a52b3fdb039cfae5b)

74444a93 Fix the project auto devops API

1 files changed, 36 insertions, 15 deletions

diff --git a/spec/models/concerns/project_api_compatibility_spec.rb b/spec/models/concerns/project_api_compatibility_spec.rb
index 8cecd4fe7bc..f5722f88aac 100644
--- a/spec/models/concerns/project_api_compatibility_spec.rb
+++ b/spec/models/concerns/project_api_compatibility_spec.rb
@@ -16,23 +16,44 @@ describe ProjectAPICompatibility do
     expect(project.build_allow_git_fetch).to eq(false)
   end
 
-  # auto_devops_enabled
-  it "converts auto_devops_enabled=false to auto_devops_enabled?=false" do
-    expect(project.auto_devops_enabled?).to eq(true)
-    project.update!(auto_devops_enabled: false)
-    expect(project.auto_devops_enabled?).to eq(false)
-  end
+  describe '#auto_devops_enabled' do
+    where(
+      initial: [:missing, nil, false, true],
+      final: [nil, false, true]
+    )
+
+    with_them do
+      before do
+        project.build_auto_devops(enabled: initial) unless initial == :missing
+      end
+
+      # Implicit auto devops when enabled is nil
+      let(:expected) { final.nil? ? true : final }
+
+      it 'sets the correct value' do
+        project.update!(auto_devops_enabled: final)
 
-  it "converts auto_devops_enabled=true to auto_devops_enabled?=true" do
-    expect(project.auto_devops_enabled?).to eq(true)
-    project.update!(auto_devops_enabled: true)
-    expect(project.auto_devops_enabled?).to eq(true)
+        expect(project.auto_devops_enabled?).to eq(expected)
+      end
+    end
   end
 
-  # auto_devops_deploy_strategy
-  it "converts auto_devops_deploy_strategy=timed_incremental to auto_devops.deploy_strategy=timed_incremental" do
-    expect(project.auto_devops).to be_nil
-    project.update!(auto_devops_deploy_strategy: 'timed_incremental')
-    expect(project.auto_devops.deploy_strategy).to eq('timed_incremental')
+  describe '#auto_devops_deploy_strategy' do
+    where(
+      initial: [:missing, *ProjectAutoDevops.deploy_strategies.keys],
+      final: ProjectAutoDevops.deploy_strategies.keys
+    )
+
+    with_them do
+      before do
+        project.build_auto_devops(deploy_strategy: initial) unless initial == :missing
+      end
+
+      it 'sets the correct value' do
+        project.update!(auto_devops_deploy_strategy: final)
+
+        expect(project.auto_devops.deploy_strategy).to eq(final)
+      end
+    end
   end
 end