Merge pull request #2263 from tvdeyen/fix-mysql-builds

CI: Fix mysql builds

Gemfile

@@ -4,7 +4,13 @@ source "https://rubygems.org"
 gemspec
 
 rails_version = ENV.fetch("RAILS_VERSION", 6.1).to_f
-gem "rails", "~> #{rails_version}.0"
+# Necessary until a new 6.1.5 version has been released
+# https://github.com/rails/rails/pull/44691
+if rails_version.to_s.match?(/6.1/)
+  gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
+else
+  gem "rails", "~> #{rails_version}.0"
+end
 
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"
   gem "sqlite3", "~> 1.4.1"

spec/controllers/alchemy/api/pages_controller_spec.rb

@@ -89,7 +89,10 @@ module Alchemy
           context "as guest user" do
             it "only returns pages for current site" do
               get :index, format: :json
-              expect(result["pages"].map { |r| r["id"] }).to eq([page.parent_id, page.id])
+              expect(result["pages"].map { |r| r["id"] }).to match_array([
+                page.parent_id,
+                page.id,
+              ])
             end
           end
 
@@ -100,7 +103,7 @@ module Alchemy
 
             it "returns all pages" do
               get :index, format: :json
-              expect(result["pages"].map { |r| r["id"] }).to eq([
+              expect(result["pages"].map { |r| r["id"] }).to match_array([
                 page.parent_id,
                 page.id,
                 site_2_page.parent_id,