Merge branch 'upgrade-rails-5-2-ce' into 'master'

[CE] Upgrade to Rails 5.2

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

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/lib/api/helpers/pagination_spec.rb b/spec/lib/api/helpers/pagination_spec.rb
index c788da55cd2..b0a00392957 100644
--- a/spec/lib/api/helpers/pagination_spec.rb
+++ b/spec/lib/api/helpers/pagination_spec.rb
@@ -114,7 +114,7 @@ describe API::Helpers::Pagination do
             expect(paginated_relation.order_values).to be_present
             expect(paginated_relation.order_values.size).to eq(1)
             expect(paginated_relation.order_values.first).to be_descending
-            expect(paginated_relation.order_values.first.expr.name).to eq :id
+            expect(paginated_relation.order_values.first.expr.name).to eq 'id'
           end
         end
 
@@ -151,9 +151,9 @@ describe API::Helpers::Pagination do
             expect(paginated_relation.order_values).to be_present
             expect(paginated_relation.order_values.size).to eq(2)
             expect(paginated_relation.order_values.first).to be_descending
-            expect(paginated_relation.order_values.first.expr.name).to eq :name
+            expect(paginated_relation.order_values.first.expr.name).to eq 'name'
             expect(paginated_relation.order_values.second).to be_descending
-            expect(paginated_relation.order_values.second.expr.name).to eq :id
+            expect(paginated_relation.order_values.second.expr.name).to eq 'id'
           end
 
           it 'returns the right records (first page)' do
@@ -341,7 +341,7 @@ describe API::Helpers::Pagination do
           expect(resource.order_values).to be_empty
           expect(paginated_relation.order_values).to be_present
           expect(paginated_relation.order_values.first).to be_ascending
-          expect(paginated_relation.order_values.first.expr.name).to eq :id
+          expect(paginated_relation.order_values.first.expr.name).to eq 'id'
         end
 
         it 'is present it does not add anything' do
@@ -349,7 +349,7 @@ describe API::Helpers::Pagination do
 
           expect(paginated_relation.order_values).to be_present
           expect(paginated_relation.order_values.first).to be_descending
-          expect(paginated_relation.order_values.first.expr.name).to eq :created_at
+          expect(paginated_relation.order_values.first.expr.name).to eq 'created_at'
         end
       end
     end