Merge pull request #41 from blocknotes/test/include-variants-in-tests

blocknotes · web-flow · commit 35e5a7e34160 · 2023-11-03T09:30:33.000+01:00
test: include variants in tests
diff --git a/.github/workflows/specs_mssql_61.yml b/.github/workflows/specs_mssql_61.yml
@@ -34,8 +34,8 @@ jobs:
           - 1433:1433
 
     steps:
-      - name: Install FreeTDS
-        run: sudo apt-get install -y freetds-dev freetds-bin
+      - name: Install FreeTDS and lib VIPS
+        run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
 
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/specs_mssql_70.yml b/.github/workflows/specs_mssql_70.yml
@@ -34,8 +34,8 @@ jobs:
           - 1433:1433
 
     steps:
-      - name: Install FreeTDS
-        run: sudo apt-get install -y freetds-dev freetds-bin
+      - name: Install FreeTDS and lib VIPS
+        run: sudo apt-get install -y freetds-dev freetds-bin libvips-dev
 
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/specs_mysql_61.yml b/.github/workflows/specs_mysql_61.yml
@@ -39,6 +39,9 @@ jobs:
           - 3306:3306
 
     steps:
+      - name: Install lib VIPS
+        run: sudo apt-get install -y libvips-dev
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
diff --git a/.github/workflows/specs_mysql_70.yml b/.github/workflows/specs_mysql_70.yml
@@ -39,6 +39,9 @@ jobs:
           - 3306:3306
 
     steps:
+      - name: Install lib VIPS
+        run: sudo apt-get install -y libvips-dev
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
diff --git a/.github/workflows/specs_mysql_71.yml b/.github/workflows/specs_mysql_71.yml
@@ -39,6 +39,9 @@ jobs:
           - 3306:3306
 
     steps:
+      - name: Install lib VIPS
+        run: sudo apt-get install -y libvips-dev
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
diff --git a/.github/workflows/specs_postgres_61.yml b/.github/workflows/specs_postgres_61.yml
@@ -39,6 +39,9 @@ jobs:
           - 5432:5432
 
     steps:
+      - name: Install lib VIPS
+        run: sudo apt-get install -y libvips-dev
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
diff --git a/.github/workflows/specs_postgres_70.yml b/.github/workflows/specs_postgres_70.yml
@@ -39,6 +39,9 @@ jobs:
           - 5432:5432
 
     steps:
+      - name: Install lib VIPS
+        run: sudo apt-get install -y libvips-dev
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
diff --git a/.github/workflows/specs_postgres_71.yml b/.github/workflows/specs_postgres_71.yml
@@ -39,6 +39,9 @@ jobs:
           - 5432:5432
 
     steps:
+      - name: Install lib VIPS
+        run: sudo apt-get install -y libvips-dev
+
       - name: Checkout repository
         uses: actions/checkout@v2
 
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -26,7 +26,7 @@ RSpec/DescribeClass:
 
 RSpec/ExampleLength:
   # Default is 5
-  Max: 10
+  Max: 15
 
 RSpec/MultipleExpectations:
   # Default is 1
diff --git a/Gemfile b/Gemfile
@@ -13,6 +13,8 @@ group :development, :test do
   gem 'mysql2' if ENV['DB_TEST'] == 'mysql'
   gem 'pg' if ['postgres', 'postgresql'].include? ENV['DB_TEST']
 
+  gem "image_processing", ">= 1.2"
+
   gem 'simplecov'
   gem 'simplecov-lcov'
 
diff --git a/gemfiles/rails_6_1_mssql.gemfile b/gemfiles/rails_6_1_mssql.gemfile
@@ -7,6 +7,7 @@ gem "rails", "~> 6.1.0"
 gem "tiny_tds"
 
 group :development, :test do
+  gem "image_processing", ">= 1.2"
   gem "simplecov"
   gem "simplecov-lcov"
   gem "capybara"
diff --git a/gemfiles/rails_6_1_mssql.gemfile.lock b/gemfiles/rails_6_1_mssql.gemfile.lock
@@ -104,10 +104,14 @@ GEM
     fasterer (0.10.1)
       colorize (~> 0.7)
       ruby_parser (>= 3.19.1)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    image_processing (1.12.2)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
     loofah (2.21.4)
@@ -121,6 +125,7 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.4)
     minitest (5.20.0)
@@ -235,6 +240,8 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
+    ruby-vips (2.1.4)
+      ffi (~> 1.12)
     ruby_parser (3.20.3)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
@@ -283,6 +290,7 @@ DEPENDENCIES
   capybara
   factory_bot_rails (~> 6.1)
   fasterer
+  image_processing (>= 1.2)
   pry-rails
   rails (~> 6.1.0)
   rspec-rails
diff --git a/gemfiles/rails_6_1_mysql.gemfile b/gemfiles/rails_6_1_mysql.gemfile
@@ -6,6 +6,7 @@ gem "mysql2"
 gem "rails", "~> 6.1.0"
 
 group :development, :test do
+  gem "image_processing", ">= 1.2"
   gem "simplecov"
   gem "simplecov-lcov"
   gem "capybara"
diff --git a/gemfiles/rails_6_1_mysql.gemfile.lock b/gemfiles/rails_6_1_mysql.gemfile.lock
@@ -101,10 +101,14 @@ GEM
     fasterer (0.9.0)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
+    ffi (1.16.3)
     globalid (1.0.0)
       activesupport (>= 5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
+    image_processing (1.12.2)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -113,6 +117,7 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.15.0)
@@ -206,6 +211,8 @@ GEM
     rubocop-rspec (2.8.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
+    ruby-vips (2.1.4)
+      ffi (~> 1.12)
     ruby_parser (3.18.1)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
@@ -251,6 +258,7 @@ DEPENDENCIES
   capybara
   factory_bot_rails (~> 6.1)
   fasterer
+  image_processing (>= 1.2)
   mysql2
   pry-rails
   rails (~> 6.1.0)
diff --git a/gemfiles/rails_6_1_postgres.gemfile b/gemfiles/rails_6_1_postgres.gemfile
@@ -6,6 +6,7 @@ gem "pg"
 gem "rails", "~> 6.1.0"
 
 group :development, :test do
+  gem "image_processing", ">= 1.2"
   gem "simplecov"
   gem "simplecov-lcov"
   gem "capybara"
diff --git a/gemfiles/rails_6_1_postgres.gemfile.lock b/gemfiles/rails_6_1_postgres.gemfile.lock
@@ -101,10 +101,14 @@ GEM
     fasterer (0.9.0)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
+    ffi (1.16.3)
     globalid (1.0.0)
       activesupport (>= 5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
+    image_processing (1.12.2)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -113,6 +117,7 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.15.0)
@@ -210,6 +215,8 @@ GEM
     rubocop-rspec (2.8.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
+    ruby-vips (2.1.4)
+      ffi (~> 1.12)
     ruby_parser (3.18.1)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
@@ -255,6 +262,7 @@ DEPENDENCIES
   capybara
   factory_bot_rails (~> 6.1)
   fasterer
+  image_processing (>= 1.2)
   pg
   pry-rails
   rails (~> 6.1.0)
diff --git a/gemfiles/rails_7_0_mssql.gemfile b/gemfiles/rails_7_0_mssql.gemfile
@@ -7,6 +7,7 @@ gem "rails", "~> 7.0.0"
 gem "tiny_tds"
 
 group :development, :test do
+  gem "image_processing", ">= 1.2"
   gem "simplecov"
   gem "simplecov-lcov"
   gem "capybara"
diff --git a/gemfiles/rails_7_0_mssql.gemfile.lock b/gemfiles/rails_7_0_mssql.gemfile.lock
@@ -110,10 +110,14 @@ GEM
     fasterer (0.10.1)
       colorize (~> 0.7)
       ruby_parser (>= 3.19.1)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    image_processing (1.12.2)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
     loofah (2.21.4)
@@ -127,6 +131,7 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.5)
     minitest (5.20.0)
     net-imap (0.4.3)
@@ -239,6 +244,8 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
+    ruby-vips (2.1.4)
+      ffi (~> 1.12)
     ruby_parser (3.20.3)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
@@ -280,6 +287,7 @@ DEPENDENCIES
   capybara
   factory_bot_rails (~> 6.1)
   fasterer
+  image_processing (>= 1.2)
   pry-rails
   rails (~> 7.0.0)
   rspec-rails
diff --git a/gemfiles/rails_7_0_mysql.gemfile b/gemfiles/rails_7_0_mysql.gemfile
@@ -6,6 +6,7 @@ gem "mysql2"
 gem "rails", "~> 7.0.0"
 
 group :development, :test do
+  gem "image_processing", ">= 1.2"
   gem "simplecov"
   gem "simplecov-lcov"
   gem "capybara"
diff --git a/gemfiles/rails_7_0_mysql.gemfile.lock b/gemfiles/rails_7_0_mysql.gemfile.lock
@@ -107,10 +107,14 @@ GEM
     fasterer (0.10.1)
       colorize (~> 0.7)
       ruby_parser (>= 3.19.1)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    image_processing (1.12.2)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
     loofah (2.21.4)
@@ -124,6 +128,7 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.5)
     minitest (5.20.0)
     mysql2 (0.5.5)
@@ -239,6 +244,8 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
+    ruby-vips (2.1.4)
+      ffi (~> 1.12)
     ruby_parser (3.20.3)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
@@ -279,6 +286,7 @@ DEPENDENCIES
   capybara
   factory_bot_rails (~> 6.1)
   fasterer
+  image_processing (>= 1.2)
   mysql2
   pry-rails
   rails (~> 7.0.0)
diff --git a/gemfiles/rails_7_0_postgres.gemfile b/gemfiles/rails_7_0_postgres.gemfile
@@ -6,6 +6,7 @@ gem "pg"
 gem "rails", "~> 7.0.0"
 
 group :development, :test do
+  gem "image_processing", ">= 1.2"
   gem "simplecov"
   gem "simplecov-lcov"
   gem "capybara"
diff --git a/gemfiles/rails_7_0_postgres.gemfile.lock b/gemfiles/rails_7_0_postgres.gemfile.lock
@@ -107,10 +107,14 @@ GEM
     fasterer (0.10.1)
       colorize (~> 0.7)
       ruby_parser (>= 3.19.1)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    image_processing (1.12.2)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
     loofah (2.21.4)
@@ -124,6 +128,7 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.5)
     minitest (5.20.0)
     net-imap (0.4.3)
@@ -239,6 +244,8 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
+    ruby-vips (2.1.4)
+      ffi (~> 1.12)
     ruby_parser (3.20.3)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
@@ -279,6 +286,7 @@ DEPENDENCIES
   capybara
   factory_bot_rails (~> 6.1)
   fasterer
+  image_processing (>= 1.2)
   pg
   pry-rails
   rails (~> 7.0.0)
diff --git a/gemfiles/rails_7_1_mysql.gemfile b/gemfiles/rails_7_1_mysql.gemfile
@@ -6,6 +6,7 @@ gem "mysql2"
 gem "rails", "~> 7.1.0"
 
 group :development, :test do
+  gem "image_processing", ">= 1.2"
   gem "simplecov"
   gem "simplecov-lcov"
   gem "capybara"
diff --git a/gemfiles/rails_7_1_mysql.gemfile.lock b/gemfiles/rails_7_1_mysql.gemfile.lock
diff --git a/gemfiles/rails_7_1_postgres.gemfile b/gemfiles/rails_7_1_postgres.gemfile
diff --git a/gemfiles/rails_7_1_postgres.gemfile.lock b/gemfiles/rails_7_1_postgres.gemfile.lock
diff --git a/spec/dummy61/config/environments/test.rb b/spec/dummy61/config/environments/test.rb
diff --git a/spec/dummy70/config/environments/test.rb b/spec/dummy70/config/environments/test.rb
diff --git a/spec/dummy_base/app/models/post.rb b/spec/dummy_base/app/models/post.rb
diff --git a/spec/fixtures/files/file3.png b/spec/fixtures/files/file3.png
diff --git a/spec/integration/attachments_spec.rb b/spec/integration/attachments_spec.rb
