Business intelligence made simple
Test with multiple Rails versions on CI
Andrew Kane8e6a63970089
diff --git a/.github/workflows/build.yml b/.github/workflows/build.ymlindex 8b025041..57d9f38a 100644--- a/.github/workflows/build.yml+++ b/.github/workflows/build.yml@@ -3,11 +3,29 @@ on: [push, pull_request]jobs:build:runs-on: ubuntu-latest+ strategy:+ fail-fast: false+ matrix:+ include:+ - ruby: 3.1+ gemfile: Gemfile+ - ruby: "3.0"+ gemfile: gemfiles/rails61.gemfile+ - ruby: 2.7+ gemfile: gemfiles/rails60.gemfile+ - ruby: 2.6+ gemfile: gemfiles/rails52.gemfile+ - ruby: 2.5+ gemfile: gemfiles/rails51.gemfile+ - ruby: 2.4+ gemfile: gemfiles/rails50.gemfile+ env:+ BUNDLE_GEMFILE: ${{ matrix.gemfile }}steps:- uses: actions/checkout@v2- uses: ruby/setup-ruby@v1with:- ruby-version: 3.1+ ruby-version: ${{ matrix.ruby }}bundler-cache: true- uses: ankane/setup-postgres@v1with:diff --git a/.gitignore b/.gitignoreindex 9422fab8..6aae2218 100644--- a/.gitignore+++ b/.gitignore@@ -14,3 +14,4 @@*.log*.sqlite/test/internal/tmp+*.lockdiff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfilenew file mode 100644index 00000000..822c53dd--- /dev/null+++ b/gemfiles/rails50.gemfile@@ -0,0 +1,9 @@+source "https://rubygems.org"++gemspec path: ".."++gem "rake"+gem "minitest", ">= 5"+gem "combustion"+gem "rails", "~> 5.0.0"+gem "pg"diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfilenew file mode 100644index 00000000..d3ca05fb--- /dev/null+++ b/gemfiles/rails51.gemfile@@ -0,0 +1,9 @@+source "https://rubygems.org"++gemspec path: ".."++gem "rake"+gem "minitest", ">= 5"+gem "combustion"+gem "rails", "~> 5.1.0"+gem "pg"diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfilenew file mode 100644index 00000000..99410e39--- /dev/null+++ b/gemfiles/rails52.gemfile@@ -0,0 +1,9 @@+source "https://rubygems.org"++gemspec path: ".."++gem "rake"+gem "minitest", ">= 5"+gem "combustion"+gem "rails", "~> 5.2.0"+gem "pg"diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfilenew file mode 100644index 00000000..655f29a2--- /dev/null+++ b/gemfiles/rails60.gemfile@@ -0,0 +1,9 @@+source "https://rubygems.org"++gemspec path: ".."++gem "rake"+gem "minitest", ">= 5"+gem "combustion"+gem "rails", "~> 6.0.0"+gem "pg"diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfilenew file mode 100644index 00000000..18d9a365--- /dev/null+++ b/gemfiles/rails61.gemfile@@ -0,0 +1,9 @@+source "https://rubygems.org"++gemspec path: ".."++gem "rake"+gem "minitest", ">= 5"+gem "combustion"+gem "rails", "~> 6.1.0"+gem "pg"diff --git a/test/charts_test.rb b/test/charts_test.rbindex 317b3342..ecb64a6a 100644--- a/test/charts_test.rb+++ b/test/charts_test.rb@@ -12,12 +12,12 @@ class ChartsTest < ActionDispatch::IntegrationTestenddef test_column_chart_format1- run_query "SELECT 'Label', 1"+ run_query "SELECT 'Label' AS label, 1"assert_match "ColumnChart", response.bodyenddef test_column_chart_format2- run_query "SELECT 'Label', 'Group', 1"+ run_query "SELECT 'Label' AS label, 'Group' AS group, 1"assert_match "ColumnChart", response.bodyassert_match %{"name":"Group"}, response.bodyenddiff --git a/test/checks_test.rb b/test/checks_test.rbindex c87934ea..a9fe8e6b 100644--- a/test/checks_test.rb+++ b/test/checks_test.rb@@ -50,6 +50,8 @@ class ChecksTest < ActionDispatch::IntegrationTestenddef test_emails+ skip "No assert_emails" if Rails::VERSION::MAJOR < 6+query = create_querycheck = create_check(query: query, check_type: "bad_data", emails: "[email protected],[email protected]")diff --git a/test/queries_test.rb b/test/queries_test.rbindex 8aaae8ab..364abb61 100644--- a/test/queries_test.rb+++ b/test/queries_test.rb@@ -107,7 +107,7 @@ class QueriesTest < ActionDispatch::IntegrationTestdef test_imagesBlazer.stub(:images, true) dorun_query("SELECT 'http://localhost:3000/image.png'")- assert_match %{<img referrerpolicy="no-referrer" src="http://localhost:3000/image.png" />}, response.body+ assert_match %{<img referrerpolicy="no-referrer" src="http://localhost:3000/image.png" }, response.bodyendendend