From 078638a6ab0161ede25653484fd7e37df7f8708e Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushalspandya@gmail.com>
Date: Tue, 23 May 2017 07:18:08 +0000
Subject: Merge branch 'fix-retried-for-postgres' into 'master'

Fix migrations for older PostgreSQL versions

Closes #32721

See merge request !11620
---
 spec/migrations/upate_retried_for_ci_builds_spec.rb  | 17 -----------------
 spec/migrations/update_retried_for_ci_builds_spec.rb | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 spec/migrations/upate_retried_for_ci_builds_spec.rb
 create mode 100644 spec/migrations/update_retried_for_ci_builds_spec.rb

(limited to 'spec')

diff --git a/spec/migrations/upate_retried_for_ci_builds_spec.rb b/spec/migrations/upate_retried_for_ci_builds_spec.rb
deleted file mode 100644
index 5cdb8a3c7da..00000000000
--- a/spec/migrations/upate_retried_for_ci_builds_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20170503004427_upate_retried_for_ci_build.rb')
-
-describe UpateRetriedForCiBuild, truncate: true do
-  let(:pipeline) { create(:ci_pipeline) }
-  let!(:build_old) { create(:ci_build, pipeline: pipeline, name: 'test') }
-  let!(:build_new) { create(:ci_build, pipeline: pipeline, name: 'test') }
-
-  before do
-    described_class.new.up
-  end
-
-  it 'updates ci_builds.is_retried' do
-    expect(build_old.reload).to be_retried
-    expect(build_new.reload).not_to be_retried
-  end
-end
diff --git a/spec/migrations/update_retried_for_ci_builds_spec.rb b/spec/migrations/update_retried_for_ci_builds_spec.rb
new file mode 100644
index 00000000000..3742b4dafe5
--- /dev/null
+++ b/spec/migrations/update_retried_for_ci_builds_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20170503004427_update_retried_for_ci_build.rb')
+
+describe UpdateRetriedForCiBuild, truncate: true do
+  let(:pipeline) { create(:ci_pipeline) }
+  let!(:build_old) { create(:ci_build, pipeline: pipeline, name: 'test') }
+  let!(:build_new) { create(:ci_build, pipeline: pipeline, name: 'test') }
+
+  before do
+    described_class.new.up
+  end
+
+  it 'updates ci_builds.is_retried' do
+    expect(build_old.reload).to be_retried
+    expect(build_new.reload).not_to be_retried
+  end
+end
-- 
cgit v1.2.3