From 4b13c050c1703d24e86c82d9c0d00ece71bb0bf8 Mon Sep 17 00:00:00 2001 From: Victorio Date: Wed, 18 Jan 2017 10:08:18 +0100 Subject: [PATCH 01/11] Change range rails versions --- blocks.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blocks.gemspec b/blocks.gemspec index ac90db8..c9aa517 100644 --- a/blocks.gemspec +++ b/blocks.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "CHANGELOG", "LICENSE", "Rakefile", "README.md"] s.test_files = Dir["spec/**/*"] - s.add_dependency "rails", "~> 4.0", '<= 4.2.3' + s.add_dependency "rails", ">= 4.0", '< 5.1' s.add_dependency "globalize", '>= 4.0.0', '< 5.1' s.add_dependency "awesome_nested_set", '~> 3.0.0' From 30c69ce0ce0867244604ea59e8252f761d6b508e Mon Sep 17 00:00:00 2001 From: Victorio Date: Wed, 18 Jan 2017 10:19:12 +0100 Subject: [PATCH 02/11] Range rails version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7741318..918e8df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ PATH nocms-blocks (1.1.3) awesome_nested_set (~> 3.0.0) globalize (>= 4.0.0, < 5.1) - rails (~> 4.0, <= 4.2.3) + rails (>= 4.0, < 5.1) GEM remote: https://rubygems.org/ From 222b3228275546cdfac801351a2bf3482dc36ae2 Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Tue, 28 May 2019 20:04:08 +0200 Subject: [PATCH 03/11] Changes in gemspec and version for version 1.2 --- Gemfile.lock | 15 ++++++++------- blocks.gemspec | 2 +- gemfiles/rails_4_0_mysql.gemfile.lock | 2 +- gemfiles/rails_4_0_pgsql.gemfile.lock | 2 +- gemfiles/rails_4_0_sqlite.gemfile.lock | 2 +- gemfiles/rails_4_1_mysql.gemfile.lock | 2 +- gemfiles/rails_4_1_pgsql.gemfile.lock | 2 +- gemfiles/rails_4_1_sqlite.gemfile.lock | 2 +- gemfiles/rails_4_2_mysql.gemfile.lock | 2 +- gemfiles/rails_4_2_pgsql.gemfile.lock | 2 +- gemfiles/rails_4_2_sqlite.gemfile.lock | 2 +- gemfiles/rails_5_0_mysql.gemfile.lock | 2 +- gemfiles/rails_5_0_pgsql.gemfile.lock | 2 +- gemfiles/rails_5_0_sqlite.gemfile.lock | 2 +- gemfiles/rails_5_1_mysql.gemfile.lock | 2 +- gemfiles/rails_5_1_pgsql.gemfile.lock | 2 +- gemfiles/rails_5_1_sqlite.gemfile.lock | 2 +- lib/no_cms/blocks/version.rb | 2 +- 18 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 194831c..4a98cdc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) @@ -79,7 +79,7 @@ GEM mime-types (>= 1.16) mimemagic (>= 0.3.0) coderay (1.1.1) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) database_cleaner (1.5.3) debug_inspector (0.0.2) diff-lcs (1.2.5) @@ -92,7 +92,7 @@ GEM generator_spec (0.9.3) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) globalize (5.0.1) activemodel (>= 4.2.0, < 4.3) @@ -103,13 +103,14 @@ GEM addressable (~> 2.3) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.1) + mini_mime (>= 0.1.1) method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) + mini_mime (1.0.1) mini_portile2 (2.1.0) minitest (5.9.1) nokogiri (1.6.8.1) @@ -188,10 +189,10 @@ GEM json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) diff --git a/blocks.gemspec b/blocks.gemspec index b3c555c..d2d9833 100644 --- a/blocks.gemspec +++ b/blocks.gemspec @@ -7,7 +7,7 @@ require "no_cms/blocks/version" Gem::Specification.new do |s| s.name = "nocms-blocks" s.version = NoCms::Blocks::VERSION - s.authors = ["Rodrigo Garcia Suarez", 'Fernando Fdz. Zapico', 'Luis Mendo', 'Victor Ortiz', 'David J. Brenes'] + s.authors = ["Rodrigo Garcia Suarez", 'Fernando Fdz. Zapico', 'Luis Mendo', 'Victor Ortiz', 'David J. Brenes', "Victorio Iglesias"] s.email = ['gems@simplelogica.net'] s.homepage = "https://github.com/simplelogica/nocms-blocks" s.summary = "Engine of configurable content blocks CMS agnostic (NoCMS)." diff --git a/gemfiles/rails_4_0_mysql.gemfile.lock b/gemfiles/rails_4_0_mysql.gemfile.lock index 03efc7a..599e39d 100644 --- a/gemfiles/rails_4_0_mysql.gemfile.lock +++ b/gemfiles/rails_4_0_mysql.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_4_0_pgsql.gemfile.lock b/gemfiles/rails_4_0_pgsql.gemfile.lock index 07b57bd..35b0abf 100644 --- a/gemfiles/rails_4_0_pgsql.gemfile.lock +++ b/gemfiles/rails_4_0_pgsql.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_4_0_sqlite.gemfile.lock b/gemfiles/rails_4_0_sqlite.gemfile.lock index 713fde5..0813e7b 100644 --- a/gemfiles/rails_4_0_sqlite.gemfile.lock +++ b/gemfiles/rails_4_0_sqlite.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_4_1_mysql.gemfile.lock b/gemfiles/rails_4_1_mysql.gemfile.lock index 59b6ccd..45c210c 100644 --- a/gemfiles/rails_4_1_mysql.gemfile.lock +++ b/gemfiles/rails_4_1_mysql.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_4_1_pgsql.gemfile.lock b/gemfiles/rails_4_1_pgsql.gemfile.lock index 69c0851..4c2fd7e 100644 --- a/gemfiles/rails_4_1_pgsql.gemfile.lock +++ b/gemfiles/rails_4_1_pgsql.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_4_1_sqlite.gemfile.lock b/gemfiles/rails_4_1_sqlite.gemfile.lock index e0d5047..8bbec24 100644 --- a/gemfiles/rails_4_1_sqlite.gemfile.lock +++ b/gemfiles/rails_4_1_sqlite.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_4_2_mysql.gemfile.lock b/gemfiles/rails_4_2_mysql.gemfile.lock index 25156cb..4c5af03 100644 --- a/gemfiles/rails_4_2_mysql.gemfile.lock +++ b/gemfiles/rails_4_2_mysql.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_4_2_pgsql.gemfile.lock b/gemfiles/rails_4_2_pgsql.gemfile.lock index 0668d41..55618ab 100644 --- a/gemfiles/rails_4_2_pgsql.gemfile.lock +++ b/gemfiles/rails_4_2_pgsql.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_4_2_sqlite.gemfile.lock b/gemfiles/rails_4_2_sqlite.gemfile.lock index c344f86..743d7bc 100644 --- a/gemfiles/rails_4_2_sqlite.gemfile.lock +++ b/gemfiles/rails_4_2_sqlite.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_5_0_mysql.gemfile.lock b/gemfiles/rails_5_0_mysql.gemfile.lock index 5a3495e..3aa262e 100644 --- a/gemfiles/rails_5_0_mysql.gemfile.lock +++ b/gemfiles/rails_5_0_mysql.gemfile.lock @@ -27,7 +27,7 @@ GIT PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_5_0_pgsql.gemfile.lock b/gemfiles/rails_5_0_pgsql.gemfile.lock index 17f9b1f..34d3bb7 100644 --- a/gemfiles/rails_5_0_pgsql.gemfile.lock +++ b/gemfiles/rails_5_0_pgsql.gemfile.lock @@ -27,7 +27,7 @@ GIT PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_5_0_sqlite.gemfile.lock b/gemfiles/rails_5_0_sqlite.gemfile.lock index 7b1d2b8..51b2ec1 100644 --- a/gemfiles/rails_5_0_sqlite.gemfile.lock +++ b/gemfiles/rails_5_0_sqlite.gemfile.lock @@ -27,7 +27,7 @@ GIT PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_5_1_mysql.gemfile.lock b/gemfiles/rails_5_1_mysql.gemfile.lock index b8af4d2..0300786 100644 --- a/gemfiles/rails_5_1_mysql.gemfile.lock +++ b/gemfiles/rails_5_1_mysql.gemfile.lock @@ -27,7 +27,7 @@ GIT PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_5_1_pgsql.gemfile.lock b/gemfiles/rails_5_1_pgsql.gemfile.lock index 9e2a063..07a4011 100644 --- a/gemfiles/rails_5_1_pgsql.gemfile.lock +++ b/gemfiles/rails_5_1_pgsql.gemfile.lock @@ -27,7 +27,7 @@ GIT PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/gemfiles/rails_5_1_sqlite.gemfile.lock b/gemfiles/rails_5_1_sqlite.gemfile.lock index 98c8499..1837d7a 100644 --- a/gemfiles/rails_5_1_sqlite.gemfile.lock +++ b/gemfiles/rails_5_1_sqlite.gemfile.lock @@ -27,7 +27,7 @@ GIT PATH remote: ../ specs: - nocms-blocks (1.1.4) + nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 5.2) awesome_nested_set (>= 3.0.0, < 3.2) globalize (>= 4.0.0, < 5.2) diff --git a/lib/no_cms/blocks/version.rb b/lib/no_cms/blocks/version.rb index 6c65ea1..5b98245 100644 --- a/lib/no_cms/blocks/version.rb +++ b/lib/no_cms/blocks/version.rb @@ -1,5 +1,5 @@ module NoCms module Blocks - VERSION = "1.1.4" + VERSION = "1.2.0" end end From fbfe3d816ecb5151cdfa71c4b9f16fe520b0f96f Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Tue, 28 May 2019 20:05:01 +0200 Subject: [PATCH 04/11] Version in changelog --- CHANGELOG | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 485f33c..8272d79 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Edge +1.2.0 - Support for rails 4.2.X, 4.1.X, 5.0.X and 5.1.X - Slots for allowing to create multiple relationships between blocks and other @@ -14,7 +14,7 @@ Edge - Added multiple ActiveRecord/ActiveResource fields - Added appraisals to test support with PostgreSQL - Configurable database serializer: Hash and JSON. - - Configurable database serializer: :hstore. THis includes support for + - Configurable database serializer: :hstore. This includes support for PostgreSQL's hstore serialization. - Fallback behaviour on translations. - Added template_layout parameter in block configuration. From cfc410df231695091e06793b086d37dae431a44b Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Tue, 28 May 2019 20:58:33 +0200 Subject: [PATCH 05/11] Updated and cleaned dependencies for existing Appraisals - Updated rails minor versions - Removed github versions of Globalize, ActiveResource and Rails Observers - Fixed versions for pg and sqlite gems in Rails 5.0 and below - Updated gemfile.lock files for each appraisal with latest versions of gems --- Appraisals | 52 ++---- Gemfile | 2 +- Gemfile.lock | 4 +- blocks.gemspec | 1 - gemfiles/rails_4_0_mysql.gemfile | 2 +- gemfiles/rails_4_0_mysql.gemfile.lock | 55 +++--- gemfiles/rails_4_0_pgsql.gemfile | 4 +- gemfiles/rails_4_0_pgsql.gemfile.lock | 96 +++++----- gemfiles/rails_4_0_sqlite.gemfile | 4 +- gemfiles/rails_4_0_sqlite.gemfile.lock | 94 +++++----- gemfiles/rails_4_1_mysql.gemfile | 2 +- gemfiles/rails_4_1_mysql.gemfile.lock | 57 +++--- gemfiles/rails_4_1_pgsql.gemfile | 4 +- gemfiles/rails_4_1_pgsql.gemfile.lock | 96 +++++----- gemfiles/rails_4_1_sqlite.gemfile | 4 +- gemfiles/rails_4_1_sqlite.gemfile.lock | 94 +++++----- gemfiles/rails_4_2_mysql.gemfile | 4 +- gemfiles/rails_4_2_mysql.gemfile.lock | 199 ++++++++++---------- gemfiles/rails_4_2_pgsql.gemfile | 6 +- gemfiles/rails_4_2_pgsql.gemfile.lock | 199 ++++++++++---------- gemfiles/rails_4_2_sqlite.gemfile | 6 +- gemfiles/rails_4_2_sqlite.gemfile.lock | 197 +++++++++---------- gemfiles/rails_5_0_mysql.gemfile | 8 +- gemfiles/rails_5_0_mysql.gemfile.lock | 242 +++++++++++------------- gemfiles/rails_5_0_pgsql.gemfile | 7 +- gemfiles/rails_5_0_pgsql.gemfile.lock | 241 +++++++++++------------- gemfiles/rails_5_0_sqlite.gemfile | 10 +- gemfiles/rails_5_0_sqlite.gemfile.lock | 240 +++++++++++------------- gemfiles/rails_5_1_mysql.gemfile | 7 +- gemfiles/rails_5_1_mysql.gemfile.lock | 249 ++++++++++++------------- gemfiles/rails_5_1_pgsql.gemfile | 7 +- gemfiles/rails_5_1_pgsql.gemfile.lock | 249 ++++++++++++------------- gemfiles/rails_5_1_sqlite.gemfile | 7 +- gemfiles/rails_5_1_sqlite.gemfile.lock | 247 ++++++++++++------------ 34 files changed, 1276 insertions(+), 1420 deletions(-) diff --git a/Appraisals b/Appraisals index 7dffa19..b9d7d3b 100644 --- a/Appraisals +++ b/Appraisals @@ -10,88 +10,68 @@ end appraise "rails-4-2-mysql" do gem "mysql2" - gem "rails", "4.2.9" + gem "rails", "4.2.11.1" end appraise "rails-5-0-mysql" do gem "mysql2" - gem 'rails', '5.0.5' - gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master' - gem 'rails-observers', github: 'rails/rails-observers' - gem 'activeresource', github: 'rails/activeresource' - gem "activesupport", "~> 5.0.0" + gem 'rails', '5.0.7.2' gem "awesome_nested_set", '~> 3.1.1' end appraise "rails-5-1-mysql" do gem "mysql2" - gem 'rails', '5.1.3' - gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master' - gem 'rails-observers', github: 'rails/rails-observers' - gem 'activeresource', github: 'rails/activeresource' + gem 'rails', '5.1.7' end appraise "rails-4-0-pgsql" do - gem "pg" + gem "pg", '~> 0.21.0' gem "rails", "4.0.13" end appraise "rails-4-1-pgsql" do - gem "pg" + gem "pg", '~> 0.21.0' gem "rails", "4.1.16" end appraise "rails-4-2-pgsql" do - gem "pg" - gem "rails", "4.2.9" + gem "pg", '~> 0.21.0' + gem "rails", "4.2.11.1" end appraise "rails-5-0-pgsql" do gem "pg" - gem 'rails', '5.0.5' - gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master' - gem 'rails-observers', github: 'rails/rails-observers' - gem 'activeresource', github: 'rails/activeresource' + gem 'rails', '5.0.7.2' gem "awesome_nested_set", '~> 3.1.1' end appraise "rails-5-1-pgsql" do gem "pg" - gem 'rails', '5.1.3' - gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master' - gem 'rails-observers', github: 'rails/rails-observers' - gem 'activeresource', github: 'rails/activeresource' + gem 'rails', '5.1.7' end appraise "rails-4-0-sqlite" do - gem "sqlite3" + gem "sqlite3", '~> 1.3.13' gem "rails", "4.0.13" end appraise "rails-4-1-sqlite" do - gem "sqlite3" + gem "sqlite3", '~> 1.3.13' gem "rails", "4.1.16" end appraise "rails-4-2-sqlite" do - gem "sqlite3" - gem "rails", "4.2.9" + gem "sqlite3", '~> 1.3.13' + gem "rails", "4.2.11.1" end appraise "rails-5-0-sqlite" do - gem "sqlite3" - gem 'rails', '5.0.5' - gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master' - gem 'rails-observers', github: 'rails/rails-observers' - gem 'activeresource', github: 'rails/activeresource' - gem "activesupport", "~> 5.0.0" + gem "sqlite3", '~> 1.3.13' + gem 'rails', '5.0.7.2' gem "awesome_nested_set", '~> 3.1.1' end appraise "rails-5-1-sqlite" do gem "sqlite3" - gem 'rails', '5.1.3' - gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master' - gem 'rails-observers', github: 'rails/rails-observers' - gem 'activeresource', github: 'rails/activeresource' + gem 'rails', '5.1.7' end diff --git a/Gemfile b/Gemfile index f6b137b..295a434 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ group :test do gem 'rspec-rails', '~> 3.5.0.beta' gem 'capybara-screenshot' gem 'factory_girl' - gem 'capybara' + gem 'capybara', '< 3.16' gem 'database_cleaner' gem 'faker' gem 'carrierwave' # For development and testing purposes (Images) diff --git a/Gemfile.lock b/Gemfile.lock index 4a98cdc..ce0e49e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,7 +196,6 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.12) thor (0.19.4) thread_safe (0.3.5) tzinfo (1.2.2) @@ -209,7 +208,7 @@ PLATFORMS DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -225,7 +224,6 @@ DEPENDENCIES rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/blocks.gemspec b/blocks.gemspec index d2d9833..5db3d03 100644 --- a/blocks.gemspec +++ b/blocks.gemspec @@ -21,5 +21,4 @@ Gem::Specification.new do |s| s.add_dependency "globalize", '>= 4.0.0', '< 5.2' s.add_dependency "awesome_nested_set", '>= 3.0.0', '< 3.2' - s.add_development_dependency "sqlite3" end diff --git a/gemfiles/rails_4_0_mysql.gemfile b/gemfiles/rails_4_0_mysql.gemfile index e0838e6..be22746 100644 --- a/gemfiles/rails_4_0_mysql.gemfile +++ b/gemfiles/rails_4_0_mysql.gemfile @@ -17,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_4_0_mysql.gemfile.lock b/gemfiles/rails_4_0_mysql.gemfile.lock index 599e39d..ca58d43 100644 --- a/gemfiles/rails_4_0_mysql.gemfile.lock +++ b/gemfiles/rails_4_0_mysql.gemfile.lock @@ -38,8 +38,8 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake @@ -50,8 +50,8 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.1.4) - byebug (9.0.6) - capybara (2.15.1) + byebug (9.1.0) + capybara (2.15.4) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) @@ -61,18 +61,18 @@ GEM capybara-screenshot (1.0.17) capybara (>= 1.0, < 3) launchy - carrierwave (1.1.0) + carrierwave (1.2.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.4) + database_cleaner (1.6.2) debug_inspector (0.0.3) diff-lcs (1.3) docile (1.1.5) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) faker (1.8.4) i18n (~> 0.5) @@ -82,29 +82,30 @@ GEM globalize (4.0.3) activemodel (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) - i18n (0.8.6) + i18n (0.9.5) + concurrent-ruby (~> 1.0) json (2.1.0) launchy (2.4.3) addressable (~> 2.3) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.1) + mini_mime (>= 0.1.1) method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) + mini_mime (1.0.1) + mini_portile2 (2.3.0) minitest (4.7.5) - multi_json (1.12.1) + multi_json (1.13.1) mysql2 (0.3.21) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + pry-byebug (3.5.0) + byebug (~> 9.1) pry (~> 0.10) pry-nav (0.2.4) pry (>= 0.9.10, < 0.11.0) @@ -116,7 +117,7 @@ GEM pry-stack_explorer (0.4.9.2) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) + public_suffix (3.0.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -135,7 +136,7 @@ GEM activesupport (= 4.0.13) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.2) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -153,24 +154,23 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) + simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) tzinfo (0.3.53) xpath (2.1.0) @@ -181,7 +181,7 @@ PLATFORMS DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -199,7 +199,6 @@ DEPENDENCIES rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_4_0_pgsql.gemfile b/gemfiles/rails_4_0_pgsql.gemfile index fa13fe4..b9fa3d3 100644 --- a/gemfiles/rails_4_0_pgsql.gemfile +++ b/gemfiles/rails_4_0_pgsql.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "pg" +gem "pg", "~> 0.21.0" gem "rails", "4.0.13" group :development, :test do @@ -17,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_4_0_pgsql.gemfile.lock b/gemfiles/rails_4_0_pgsql.gemfile.lock index 35b0abf..ae8c638 100644 --- a/gemfiles/rails_4_0_pgsql.gemfile.lock +++ b/gemfiles/rails_4_0_pgsql.gemfile.lock @@ -38,85 +38,85 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (4.0.2) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.1.4) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (2.15.4) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) globalize (4.0.3) activemodel (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) - i18n (0.8.6) - json (2.1.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) minitest (4.7.5) - multi_json (1.12.1) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + multi_json (1.13.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) pg (0.21.0) - pry (0.10.4) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) + public_suffix (3.1.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -135,7 +135,7 @@ GEM activesupport (= 4.0.13) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.2) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -153,24 +153,23 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) tzinfo (0.3.53) xpath (2.1.0) @@ -181,7 +180,7 @@ PLATFORMS DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -189,7 +188,7 @@ DEPENDENCIES faker generator_spec nocms-blocks! - pg + pg (~> 0.21.0) pry-byebug pry-nav pry-rails @@ -199,7 +198,6 @@ DEPENDENCIES rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_4_0_sqlite.gemfile b/gemfiles/rails_4_0_sqlite.gemfile index 76ff0fa..0336b60 100644 --- a/gemfiles/rails_4_0_sqlite.gemfile +++ b/gemfiles/rails_4_0_sqlite.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "sqlite3" +gem "sqlite3", "~> 1.3.13" gem "rails", "4.0.13" group :development, :test do @@ -17,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_4_0_sqlite.gemfile.lock b/gemfiles/rails_4_0_sqlite.gemfile.lock index 0813e7b..7eba520 100644 --- a/gemfiles/rails_4_0_sqlite.gemfile.lock +++ b/gemfiles/rails_4_0_sqlite.gemfile.lock @@ -38,84 +38,84 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (4.0.2) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.1.4) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (2.15.4) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) globalize (4.0.3) activemodel (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) - i18n (0.8.6) - json (2.1.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) minitest (4.7.5) - multi_json (1.12.1) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pry (0.10.4) + multi_json (1.13.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) + public_suffix (3.1.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -134,7 +134,7 @@ GEM activesupport (= 4.0.13) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.2) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -152,16 +152,16 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) @@ -169,7 +169,7 @@ GEM activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) tzinfo (0.3.53) xpath (2.1.0) @@ -180,7 +180,7 @@ PLATFORMS DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -197,7 +197,7 @@ DEPENDENCIES rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 + sqlite3 (~> 1.3.13) BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_4_1_mysql.gemfile b/gemfiles/rails_4_1_mysql.gemfile index a56ca1c..ded5b8e 100644 --- a/gemfiles/rails_4_1_mysql.gemfile +++ b/gemfiles/rails_4_1_mysql.gemfile @@ -17,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_4_1_mysql.gemfile.lock b/gemfiles/rails_4_1_mysql.gemfile.lock index 45c210c..44e96a8 100644 --- a/gemfiles/rails_4_1_mysql.gemfile.lock +++ b/gemfiles/rails_4_1_mysql.gemfile.lock @@ -40,8 +40,8 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake @@ -52,8 +52,8 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (9.1.0) + capybara (2.15.4) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) @@ -63,18 +63,18 @@ GEM capybara-screenshot (1.0.17) capybara (>= 1.0, < 3) launchy - carrierwave (1.1.0) + carrierwave (1.2.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.4) + database_cleaner (1.6.2) debug_inspector (0.0.3) diff-lcs (1.3) docile (1.1.5) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) faker (1.8.4) i18n (~> 0.5) @@ -84,28 +84,29 @@ GEM globalize (4.0.3) activemodel (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) - i18n (0.8.6) + i18n (0.9.5) + concurrent-ruby (~> 1.0) json (1.8.6) launchy (2.4.3) addressable (~> 2.3) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.1) + mini_mime (>= 0.1.1) method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) mysql2 (0.3.21) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + pry-byebug (3.5.0) + byebug (~> 9.1) pry (~> 0.10) pry-nav (0.2.4) pry (>= 0.9.10, < 0.11.0) @@ -117,7 +118,7 @@ GEM pry-stack_explorer (0.4.9.2) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) + public_suffix (3.0.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -138,7 +139,7 @@ GEM activesupport (= 4.1.16) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.2) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -156,26 +157,25 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) + simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) xpath (2.1.0) nokogiri (~> 1.3) @@ -185,7 +185,7 @@ PLATFORMS DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -203,7 +203,6 @@ DEPENDENCIES rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_4_1_pgsql.gemfile b/gemfiles/rails_4_1_pgsql.gemfile index 17cbbc7..1a2cce8 100644 --- a/gemfiles/rails_4_1_pgsql.gemfile +++ b/gemfiles/rails_4_1_pgsql.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "pg" +gem "pg", "~> 0.21.0" gem "rails", "4.1.16" group :development, :test do @@ -17,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_4_1_pgsql.gemfile.lock b/gemfiles/rails_4_1_pgsql.gemfile.lock index 4c2fd7e..05b1a63 100644 --- a/gemfiles/rails_4_1_pgsql.gemfile.lock +++ b/gemfiles/rails_4_1_pgsql.gemfile.lock @@ -40,84 +40,84 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (5.0.1.20140414130214) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (2.15.4) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) globalize (4.0.3) activemodel (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) - i18n (0.8.6) + i18n (0.9.5) + concurrent-ruby (~> 1.0) json (1.8.6) launchy (2.4.3) addressable (~> 2.3) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) pg (0.21.0) - pry (0.10.4) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) + public_suffix (3.1.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -138,7 +138,7 @@ GEM activesupport (= 4.1.16) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.2) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -156,26 +156,25 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) xpath (2.1.0) nokogiri (~> 1.3) @@ -185,7 +184,7 @@ PLATFORMS DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -193,7 +192,7 @@ DEPENDENCIES faker generator_spec nocms-blocks! - pg + pg (~> 0.21.0) pry-byebug pry-nav pry-rails @@ -203,7 +202,6 @@ DEPENDENCIES rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_4_1_sqlite.gemfile b/gemfiles/rails_4_1_sqlite.gemfile index 7bf3c1d..11c3967 100644 --- a/gemfiles/rails_4_1_sqlite.gemfile +++ b/gemfiles/rails_4_1_sqlite.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "sqlite3" +gem "sqlite3", "~> 1.3.13" gem "rails", "4.1.16" group :development, :test do @@ -17,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_4_1_sqlite.gemfile.lock b/gemfiles/rails_4_1_sqlite.gemfile.lock index 8bbec24..e1c4c15 100644 --- a/gemfiles/rails_4_1_sqlite.gemfile.lock +++ b/gemfiles/rails_4_1_sqlite.gemfile.lock @@ -40,83 +40,83 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (5.0.1.20140414130214) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (2.15.4) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) globalize (4.0.3) activemodel (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) - i18n (0.8.6) + i18n (0.9.5) + concurrent-ruby (~> 1.0) json (1.8.6) launchy (2.4.3) addressable (~> 2.3) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pry (0.10.4) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) + public_suffix (3.1.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -137,7 +137,7 @@ GEM activesupport (= 4.1.16) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.2) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -155,16 +155,16 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) @@ -172,9 +172,9 @@ GEM activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) xpath (2.1.0) nokogiri (~> 1.3) @@ -184,7 +184,7 @@ PLATFORMS DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -201,7 +201,7 @@ DEPENDENCIES rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 + sqlite3 (~> 1.3.13) BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_4_2_mysql.gemfile b/gemfiles/rails_4_2_mysql.gemfile index 4e1ae76..5d3c165 100644 --- a/gemfiles/rails_4_2_mysql.gemfile +++ b/gemfiles/rails_4_2_mysql.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "mysql2" -gem "rails", "4.2.9" +gem "rails", "4.2.11.1" group :development, :test do gem "pry-rails" @@ -17,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_4_2_mysql.gemfile.lock b/gemfiles/rails_4_2_mysql.gemfile.lock index 4c5af03..87dfb68 100644 --- a/gemfiles/rails_4_2_mysql.gemfile.lock +++ b/gemfiles/rails_4_2_mysql.gemfile.lock @@ -10,156 +10,163 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) + actionmailer (4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) + actionpack (4.2.11.1) + actionview (= 4.2.11.1) + activesupport (= 4.2.11.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) + actionview (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.9) - activesupport (= 4.2.9) + activejob (4.2.11.1) + activesupport (= 4.2.11.1) globalid (>= 0.3.0) - activemodel (4.2.9) - activesupport (= 4.2.9) + activemodel (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) - activerecord (4.2.9) - activemodel (= 4.2.9) - activesupport (= 4.2.9) + activerecord (4.2.11.1) + activemodel (= 4.2.11.1) + activesupport (= 4.2.11.1) arel (~> 6.0) activeresource (4.1.0) activemodel (~> 4.0) activesupport (~> 4.0) rails-observers (~> 0.1.2) - activesupport (4.2.9) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (6.0.4) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.0.1) - activemodel (>= 4.2.0, < 4.3) - activerecord (>= 4.2.0, < 4.3) - i18n (0.8.6) - json (2.1.0) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - mysql2 (0.4.8) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pry (0.10.4) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mysql2 (0.5.2) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) - rack (1.6.8) + public_suffix (3.1.0) + rack (1.6.11) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.9) - actionmailer (= 4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) - activemodel (= 4.2.9) - activerecord (= 4.2.9) - activesupport (= 4.2.9) + rails (4.2.11.1) + actionmailer (= 4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) + activemodel (= 4.2.11.1) + activerecord (= 4.2.11.1) + activesupport (= 4.2.11.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.9) + railties (= 4.2.11.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-observers (0.1.5) activemodel (>= 4.0) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + railties (4.2.11.1) + actionpack (= 4.2.11.1) + activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -177,36 +184,35 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -220,11 +226,10 @@ DEPENDENCIES pry-rails pry-remote pry-stack_explorer - rails (= 4.2.9) + rails (= 4.2.11.1) rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_4_2_pgsql.gemfile b/gemfiles/rails_4_2_pgsql.gemfile index d600023..fbf6aa1 100644 --- a/gemfiles/rails_4_2_pgsql.gemfile +++ b/gemfiles/rails_4_2_pgsql.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "pg" -gem "rails", "4.2.9" +gem "pg", "~> 0.21.0" +gem "rails", "4.2.11.1" group :development, :test do gem "pry-rails" @@ -17,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_4_2_pgsql.gemfile.lock b/gemfiles/rails_4_2_pgsql.gemfile.lock index 55618ab..a2e700c 100644 --- a/gemfiles/rails_4_2_pgsql.gemfile.lock +++ b/gemfiles/rails_4_2_pgsql.gemfile.lock @@ -10,156 +10,163 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) + actionmailer (4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) + actionpack (4.2.11.1) + actionview (= 4.2.11.1) + activesupport (= 4.2.11.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) + actionview (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.9) - activesupport (= 4.2.9) + activejob (4.2.11.1) + activesupport (= 4.2.11.1) globalid (>= 0.3.0) - activemodel (4.2.9) - activesupport (= 4.2.9) + activemodel (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) - activerecord (4.2.9) - activemodel (= 4.2.9) - activesupport (= 4.2.9) + activerecord (4.2.11.1) + activemodel (= 4.2.11.1) + activesupport (= 4.2.11.1) arel (~> 6.0) activeresource (4.1.0) activemodel (~> 4.0) activesupport (~> 4.0) rails-observers (~> 0.1.2) - activesupport (4.2.9) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (6.0.4) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.0.1) - activemodel (>= 4.2.0, < 4.3) - activerecord (>= 4.2.0, < 4.3) - i18n (0.8.6) - json (2.1.0) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) pg (0.21.0) - pry (0.10.4) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) - rack (1.6.8) + public_suffix (3.1.0) + rack (1.6.11) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.9) - actionmailer (= 4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) - activemodel (= 4.2.9) - activerecord (= 4.2.9) - activesupport (= 4.2.9) + rails (4.2.11.1) + actionmailer (= 4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) + activemodel (= 4.2.11.1) + activerecord (= 4.2.11.1) + activesupport (= 4.2.11.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.9) + railties (= 4.2.11.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-observers (0.1.5) activemodel (>= 4.0) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + railties (4.2.11.1) + actionpack (= 4.2.11.1) + activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -177,36 +184,35 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -214,17 +220,16 @@ DEPENDENCIES faker generator_spec nocms-blocks! - pg + pg (~> 0.21.0) pry-byebug pry-nav pry-rails pry-remote pry-stack_explorer - rails (= 4.2.9) + rails (= 4.2.11.1) rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_4_2_sqlite.gemfile b/gemfiles/rails_4_2_sqlite.gemfile index cef1d39..10fc7e8 100644 --- a/gemfiles/rails_4_2_sqlite.gemfile +++ b/gemfiles/rails_4_2_sqlite.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "sqlite3" -gem "rails", "4.2.9" +gem "sqlite3", "~> 1.3.13" +gem "rails", "4.2.11.1" group :development, :test do gem "pry-rails" @@ -17,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_4_2_sqlite.gemfile.lock b/gemfiles/rails_4_2_sqlite.gemfile.lock index 743d7bc..3a48461 100644 --- a/gemfiles/rails_4_2_sqlite.gemfile.lock +++ b/gemfiles/rails_4_2_sqlite.gemfile.lock @@ -10,155 +10,162 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) + actionmailer (4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) + actionpack (4.2.11.1) + actionview (= 4.2.11.1) + activesupport (= 4.2.11.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) + actionview (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.9) - activesupport (= 4.2.9) + activejob (4.2.11.1) + activesupport (= 4.2.11.1) globalid (>= 0.3.0) - activemodel (4.2.9) - activesupport (= 4.2.9) + activemodel (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) - activerecord (4.2.9) - activemodel (= 4.2.9) - activesupport (= 4.2.9) + activerecord (4.2.11.1) + activemodel (= 4.2.11.1) + activesupport (= 4.2.11.1) arel (~> 6.0) activeresource (4.1.0) activemodel (~> 4.0) activesupport (~> 4.0) rails-observers (~> 0.1.2) - activesupport (4.2.9) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (6.0.4) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.0.1) - activemodel (>= 4.2.0, < 4.3) - activerecord (>= 4.2.0, < 4.3) - i18n (0.8.6) - json (2.1.0) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pry (0.10.4) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) - rack (1.6.8) + public_suffix (3.1.0) + rack (1.6.11) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.9) - actionmailer (= 4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) - activemodel (= 4.2.9) - activerecord (= 4.2.9) - activesupport (= 4.2.9) + rails (4.2.11.1) + actionmailer (= 4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) + activemodel (= 4.2.11.1) + activerecord (= 4.2.11.1) + activesupport (= 4.2.11.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.9) + railties (= 4.2.11.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-observers (0.1.5) activemodel (>= 4.0) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + railties (4.2.11.1) + actionpack (= 4.2.11.1) + activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -176,36 +183,36 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner @@ -218,11 +225,11 @@ DEPENDENCIES pry-rails pry-remote pry-stack_explorer - rails (= 4.2.9) + rails (= 4.2.11.1) rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 + sqlite3 (~> 1.3.13) BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_5_0_mysql.gemfile b/gemfiles/rails_5_0_mysql.gemfile index 895550f..dd7766d 100644 --- a/gemfiles/rails_5_0_mysql.gemfile +++ b/gemfiles/rails_5_0_mysql.gemfile @@ -3,11 +3,7 @@ source "https://rubygems.org" gem "mysql2" -gem "rails", "5.0.5" -gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master" -gem "rails-observers", github: "rails/rails-observers" -gem "activeresource", github: "rails/activeresource" -gem "activesupport", "~> 5.0.0" +gem "rails", "5.0.7.2" gem "awesome_nested_set", "~> 3.1.1" group :development, :test do @@ -22,7 +18,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_5_0_mysql.gemfile.lock b/gemfiles/rails_5_0_mysql.gemfile.lock index 3aa262e..f222377 100644 --- a/gemfiles/rails_5_0_mysql.gemfile.lock +++ b/gemfiles/rails_5_0_mysql.gemfile.lock @@ -1,29 +1,3 @@ -GIT - remote: git://github.com/rails/activeresource.git - revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a - specs: - activeresource (5.0.0) - activemodel (>= 5.0, < 6) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 6) - -GIT - remote: git://github.com/rails/rails-observers.git - revision: c569dc1525259f5ab82cddf90958777473499997 - specs: - rails-observers (0.2.0) - activemodel (>= 4.2) - -GIT - remote: git@github.com:globalize/globalize.git - revision: ce823d437b38472365adc01a6a46f5e1bf6a4080 - branch: master - specs: - globalize (5.1.0.beta2) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) - request_store (~> 1.0) - PATH remote: ../ specs: @@ -36,156 +10,168 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.0.5) - actionpack (= 5.0.5) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.5) - actionview (= 5.0.5) - activesupport (= 5.0.5) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.5) - activesupport (= 5.0.5) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.5) - activesupport (= 5.0.5) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) globalid (>= 0.3.6) - activemodel (5.0.5) - activesupport (= 5.0.5) - activemodel-serializers-xml (1.0.1) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activemodel-serializers-xml (1.0.2) activemodel (> 5.x) - activerecord (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.0.5) - activemodel (= 5.0.5) - activesupport (= 5.0.5) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) arel (~> 7.0) - activesupport (5.0.5) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activesupport (5.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (7.1.4) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) - i18n (0.8.6) - json (2.1.0) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - mysql2 (0.4.8) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pry (0.10.4) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mysql2 (0.5.2) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) - rack (2.0.3) + public_suffix (3.1.0) + rack (2.0.7) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.5) - actioncable (= 5.0.5) - actionmailer (= 5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) - activemodel (= 5.0.5) - activerecord (= 5.0.5) - activesupport (= 5.0.5) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) bundler (>= 1.3.0) - railties (= 5.0.5) + railties (= 5.0.7.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.5) - actionpack (= 5.0.5) - activesupport (= 5.0.5) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) - request_store (1.3.2) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -203,49 +189,45 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.1.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES - activeresource! - activesupport (~> 5.0.0) appraisal awesome_nested_set (~> 3.1.1) - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner factory_girl faker generator_spec - globalize! mysql2 nocms-blocks! pry-byebug @@ -253,12 +235,10 @@ DEPENDENCIES pry-rails pry-remote pry-stack_explorer - rails (= 5.0.5) - rails-observers! + rails (= 5.0.7.2) rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_5_0_pgsql.gemfile b/gemfiles/rails_5_0_pgsql.gemfile index 7e53700..9220b72 100644 --- a/gemfiles/rails_5_0_pgsql.gemfile +++ b/gemfiles/rails_5_0_pgsql.gemfile @@ -3,10 +3,7 @@ source "https://rubygems.org" gem "pg" -gem "rails", "5.0.5" -gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master" -gem "rails-observers", github: "rails/rails-observers" -gem "activeresource", github: "rails/activeresource" +gem "rails", "5.0.7.2" gem "awesome_nested_set", "~> 3.1.1" group :development, :test do @@ -21,7 +18,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_5_0_pgsql.gemfile.lock b/gemfiles/rails_5_0_pgsql.gemfile.lock index 34d3bb7..bc68bca 100644 --- a/gemfiles/rails_5_0_pgsql.gemfile.lock +++ b/gemfiles/rails_5_0_pgsql.gemfile.lock @@ -1,29 +1,3 @@ -GIT - remote: git://github.com/rails/activeresource.git - revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a - specs: - activeresource (5.0.0) - activemodel (>= 5.0, < 6) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 6) - -GIT - remote: git://github.com/rails/rails-observers.git - revision: c569dc1525259f5ab82cddf90958777473499997 - specs: - rails-observers (0.2.0) - activemodel (>= 4.2) - -GIT - remote: git@github.com:globalize/globalize.git - revision: ce823d437b38472365adc01a6a46f5e1bf6a4080 - branch: master - specs: - globalize (5.1.0.beta2) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) - request_store (~> 1.0) - PATH remote: ../ specs: @@ -36,156 +10,168 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.0.5) - actionpack (= 5.0.5) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.5) - actionview (= 5.0.5) - activesupport (= 5.0.5) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.5) - activesupport (= 5.0.5) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.5) - activesupport (= 5.0.5) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) globalid (>= 0.3.6) - activemodel (5.0.5) - activesupport (= 5.0.5) - activemodel-serializers-xml (1.0.1) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activemodel-serializers-xml (1.0.2) activemodel (> 5.x) - activerecord (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.0.5) - activemodel (= 5.0.5) - activesupport (= 5.0.5) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) arel (~> 7.0) - activesupport (5.0.5) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activesupport (5.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (7.1.4) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) - i18n (0.8.6) - json (2.1.0) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pg (0.21.0) - pry (0.10.4) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) - rack (2.0.3) + public_suffix (3.1.0) + rack (2.0.7) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.5) - actioncable (= 5.0.5) - actionmailer (= 5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) - activemodel (= 5.0.5) - activerecord (= 5.0.5) - activesupport (= 5.0.5) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) bundler (>= 1.3.0) - railties (= 5.0.5) + railties (= 5.0.7.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.5) - actionpack (= 5.0.5) - activesupport (= 5.0.5) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) - request_store (1.3.2) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -203,48 +189,45 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.1.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES - activeresource! appraisal awesome_nested_set (~> 3.1.1) - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner factory_girl faker generator_spec - globalize! nocms-blocks! pg pry-byebug @@ -252,12 +235,10 @@ DEPENDENCIES pry-rails pry-remote pry-stack_explorer - rails (= 5.0.5) - rails-observers! + rails (= 5.0.7.2) rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_5_0_sqlite.gemfile b/gemfiles/rails_5_0_sqlite.gemfile index 80959ff..f552fe6 100644 --- a/gemfiles/rails_5_0_sqlite.gemfile +++ b/gemfiles/rails_5_0_sqlite.gemfile @@ -2,12 +2,8 @@ source "https://rubygems.org" -gem "sqlite3" -gem "rails", "5.0.5" -gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master" -gem "rails-observers", github: "rails/rails-observers" -gem "activeresource", github: "rails/activeresource" -gem "activesupport", "~> 5.0.0" +gem "sqlite3", "~> 1.3.13" +gem "rails", "5.0.7.2" gem "awesome_nested_set", "~> 3.1.1" group :development, :test do @@ -22,7 +18,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_5_0_sqlite.gemfile.lock b/gemfiles/rails_5_0_sqlite.gemfile.lock index 51b2ec1..dedc6db 100644 --- a/gemfiles/rails_5_0_sqlite.gemfile.lock +++ b/gemfiles/rails_5_0_sqlite.gemfile.lock @@ -1,29 +1,3 @@ -GIT - remote: git://github.com/rails/activeresource.git - revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a - specs: - activeresource (5.0.0) - activemodel (>= 5.0, < 6) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 6) - -GIT - remote: git://github.com/rails/rails-observers.git - revision: c569dc1525259f5ab82cddf90958777473499997 - specs: - rails-observers (0.2.0) - activemodel (>= 4.2) - -GIT - remote: git@github.com:globalize/globalize.git - revision: ce823d437b38472365adc01a6a46f5e1bf6a4080 - branch: master - specs: - globalize (5.1.0.beta2) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) - request_store (~> 1.0) - PATH remote: ../ specs: @@ -36,155 +10,167 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.0.5) - actionpack (= 5.0.5) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.5) - actionview (= 5.0.5) - activesupport (= 5.0.5) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.5) - activesupport (= 5.0.5) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.5) - activesupport (= 5.0.5) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) globalid (>= 0.3.6) - activemodel (5.0.5) - activesupport (= 5.0.5) - activemodel-serializers-xml (1.0.1) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activemodel-serializers-xml (1.0.2) activemodel (> 5.x) - activerecord (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.0.5) - activemodel (= 5.0.5) - activesupport (= 5.0.5) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) arel (~> 7.0) - activesupport (5.0.5) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activesupport (5.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (7.1.4) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) - i18n (0.8.6) - json (2.1.0) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pry (0.10.4) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) - rack (2.0.3) + public_suffix (3.1.0) + rack (2.0.7) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.5) - actioncable (= 5.0.5) - actionmailer (= 5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) - activemodel (= 5.0.5) - activerecord (= 5.0.5) - activesupport (= 5.0.5) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) bundler (>= 1.3.0) - railties (= 5.0.5) + railties (= 5.0.7.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.5) - actionpack (= 5.0.5) - activesupport (= 5.0.5) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) - request_store (1.3.2) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -202,61 +188,57 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.1.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES - activeresource! - activesupport (~> 5.0.0) appraisal awesome_nested_set (~> 3.1.1) - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner factory_girl faker generator_spec - globalize! nocms-blocks! pry-byebug pry-nav pry-rails pry-remote pry-stack_explorer - rails (= 5.0.5) - rails-observers! + rails (= 5.0.7.2) rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 + sqlite3 (~> 1.3.13) BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_5_1_mysql.gemfile b/gemfiles/rails_5_1_mysql.gemfile index 4097fdc..ed5cae0 100644 --- a/gemfiles/rails_5_1_mysql.gemfile +++ b/gemfiles/rails_5_1_mysql.gemfile @@ -3,10 +3,7 @@ source "https://rubygems.org" gem "mysql2" -gem "rails", "5.1.3" -gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master" -gem "rails-observers", github: "rails/rails-observers" -gem "activeresource", github: "rails/activeresource" +gem "rails", "5.1.7" group :development, :test do gem "pry-rails" @@ -20,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_5_1_mysql.gemfile.lock b/gemfiles/rails_5_1_mysql.gemfile.lock index 0300786..5ee8452 100644 --- a/gemfiles/rails_5_1_mysql.gemfile.lock +++ b/gemfiles/rails_5_1_mysql.gemfile.lock @@ -1,29 +1,3 @@ -GIT - remote: git://github.com/rails/activeresource.git - revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a - specs: - activeresource (5.0.0) - activemodel (>= 5.0, < 6) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 6) - -GIT - remote: git://github.com/rails/rails-observers.git - revision: c569dc1525259f5ab82cddf90958777473499997 - specs: - rails-observers (0.2.0) - activemodel (>= 4.2) - -GIT - remote: git@github.com:globalize/globalize.git - revision: ce823d437b38472365adc01a6a46f5e1bf6a4080 - branch: master - specs: - globalize (5.1.0.beta2) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) - request_store (~> 1.0) - PATH remote: ../ specs: @@ -36,156 +10,168 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.1.3) - actionpack (= 5.1.3) + actioncable (5.1.7) + actionpack (= 5.1.7) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.3) - actionpack (= 5.1.3) - actionview (= 5.1.3) - activejob (= 5.1.3) + actionmailer (5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.3) - actionview (= 5.1.3) - activesupport (= 5.1.3) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.3) - activesupport (= 5.1.3) + actionview (5.1.7) + activesupport (= 5.1.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.3) - activesupport (= 5.1.3) + activejob (5.1.7) + activesupport (= 5.1.7) globalid (>= 0.3.6) - activemodel (5.1.3) - activesupport (= 5.1.3) - activemodel-serializers-xml (1.0.1) + activemodel (5.1.7) + activesupport (= 5.1.7) + activemodel-serializers-xml (1.0.2) activemodel (> 5.x) - activerecord (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.1.3) - activemodel (= 5.1.3) - activesupport (= 5.1.3) + activerecord (5.1.7) + activemodel (= 5.1.7) + activesupport (= 5.1.7) arel (~> 8.0) - activesupport (5.1.3) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (8.0.0) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) - erubi (1.6.1) - factory_girl (4.8.0) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) - i18n (0.8.6) - json (2.1.0) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - mysql2 (0.4.8) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pry (0.10.4) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mysql2 (0.5.2) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) - rack (2.0.3) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.1.3) - actioncable (= 5.1.3) - actionmailer (= 5.1.3) - actionpack (= 5.1.3) - actionview (= 5.1.3) - activejob (= 5.1.3) - activemodel (= 5.1.3) - activerecord (= 5.1.3) - activesupport (= 5.1.3) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.1.7) + actioncable (= 5.1.7) + actionmailer (= 5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) + activemodel (= 5.1.7) + activerecord (= 5.1.7) + activesupport (= 5.1.7) bundler (>= 1.3.0) - railties (= 5.1.3) + railties (= 5.1.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.1.3) - actionpack (= 5.1.3) - activesupport (= 5.1.3) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) - request_store (1.3.2) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -203,47 +189,44 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.1.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES - activeresource! appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner factory_girl faker generator_spec - globalize! mysql2 nocms-blocks! pry-byebug @@ -251,12 +234,10 @@ DEPENDENCIES pry-rails pry-remote pry-stack_explorer - rails (= 5.1.3) - rails-observers! + rails (= 5.1.7) rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_5_1_pgsql.gemfile b/gemfiles/rails_5_1_pgsql.gemfile index fed2d16..e5335a8 100644 --- a/gemfiles/rails_5_1_pgsql.gemfile +++ b/gemfiles/rails_5_1_pgsql.gemfile @@ -3,10 +3,7 @@ source "https://rubygems.org" gem "pg" -gem "rails", "5.1.3" -gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master" -gem "rails-observers", github: "rails/rails-observers" -gem "activeresource", github: "rails/activeresource" +gem "rails", "5.1.7" group :development, :test do gem "pry-rails" @@ -20,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_5_1_pgsql.gemfile.lock b/gemfiles/rails_5_1_pgsql.gemfile.lock index 07a4011..05961c0 100644 --- a/gemfiles/rails_5_1_pgsql.gemfile.lock +++ b/gemfiles/rails_5_1_pgsql.gemfile.lock @@ -1,29 +1,3 @@ -GIT - remote: git://github.com/rails/activeresource.git - revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a - specs: - activeresource (5.0.0) - activemodel (>= 5.0, < 6) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 6) - -GIT - remote: git://github.com/rails/rails-observers.git - revision: c569dc1525259f5ab82cddf90958777473499997 - specs: - rails-observers (0.2.0) - activemodel (>= 4.2) - -GIT - remote: git@github.com:globalize/globalize.git - revision: ce823d437b38472365adc01a6a46f5e1bf6a4080 - branch: master - specs: - globalize (5.1.0.beta2) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) - request_store (~> 1.0) - PATH remote: ../ specs: @@ -36,156 +10,168 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.1.3) - actionpack (= 5.1.3) + actioncable (5.1.7) + actionpack (= 5.1.7) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.3) - actionpack (= 5.1.3) - actionview (= 5.1.3) - activejob (= 5.1.3) + actionmailer (5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.3) - actionview (= 5.1.3) - activesupport (= 5.1.3) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.3) - activesupport (= 5.1.3) + actionview (5.1.7) + activesupport (= 5.1.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.3) - activesupport (= 5.1.3) + activejob (5.1.7) + activesupport (= 5.1.7) globalid (>= 0.3.6) - activemodel (5.1.3) - activesupport (= 5.1.3) - activemodel-serializers-xml (1.0.1) + activemodel (5.1.7) + activesupport (= 5.1.7) + activemodel-serializers-xml (1.0.2) activemodel (> 5.x) - activerecord (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.1.3) - activemodel (= 5.1.3) - activesupport (= 5.1.3) + activerecord (5.1.7) + activemodel (= 5.1.7) + activesupport (= 5.1.7) arel (~> 8.0) - activesupport (5.1.3) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (8.0.0) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) - erubi (1.6.1) - factory_girl (4.8.0) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) - i18n (0.8.6) - json (2.1.0) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pg (0.21.0) - pry (0.10.4) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) - rack (2.0.3) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.1.3) - actioncable (= 5.1.3) - actionmailer (= 5.1.3) - actionpack (= 5.1.3) - actionview (= 5.1.3) - activejob (= 5.1.3) - activemodel (= 5.1.3) - activerecord (= 5.1.3) - activesupport (= 5.1.3) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.1.7) + actioncable (= 5.1.7) + actionmailer (= 5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) + activemodel (= 5.1.7) + activerecord (= 5.1.7) + activesupport (= 5.1.7) bundler (>= 1.3.0) - railties (= 5.1.3) + railties (= 5.1.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.1.3) - actionpack (= 5.1.3) - activesupport (= 5.1.3) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) - request_store (1.3.2) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -203,47 +189,44 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.1.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES - activeresource! appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner factory_girl faker generator_spec - globalize! nocms-blocks! pg pry-byebug @@ -251,12 +234,10 @@ DEPENDENCIES pry-rails pry-remote pry-stack_explorer - rails (= 5.1.3) - rails-observers! + rails (= 5.1.7) rspec-rails (~> 3.5.0.beta) simplecov simplecov-json - sqlite3 BUNDLED WITH 1.13.6 diff --git a/gemfiles/rails_5_1_sqlite.gemfile b/gemfiles/rails_5_1_sqlite.gemfile index 2f2de90..fe9080f 100644 --- a/gemfiles/rails_5_1_sqlite.gemfile +++ b/gemfiles/rails_5_1_sqlite.gemfile @@ -3,10 +3,7 @@ source "https://rubygems.org" gem "sqlite3" -gem "rails", "5.1.3" -gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master" -gem "rails-observers", github: "rails/rails-observers" -gem "activeresource", github: "rails/activeresource" +gem "rails", "5.1.7" group :development, :test do gem "pry-rails" @@ -20,7 +17,7 @@ group :test do gem "rspec-rails", "~> 3.5.0.beta" gem "capybara-screenshot" gem "factory_girl" - gem "capybara" + gem "capybara", "< 3.16" gem "database_cleaner" gem "faker" gem "carrierwave" diff --git a/gemfiles/rails_5_1_sqlite.gemfile.lock b/gemfiles/rails_5_1_sqlite.gemfile.lock index 1837d7a..f39b2df 100644 --- a/gemfiles/rails_5_1_sqlite.gemfile.lock +++ b/gemfiles/rails_5_1_sqlite.gemfile.lock @@ -1,29 +1,3 @@ -GIT - remote: git://github.com/rails/activeresource.git - revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a - specs: - activeresource (5.0.0) - activemodel (>= 5.0, < 6) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 6) - -GIT - remote: git://github.com/rails/rails-observers.git - revision: c569dc1525259f5ab82cddf90958777473499997 - specs: - rails-observers (0.2.0) - activemodel (>= 4.2) - -GIT - remote: git@github.com:globalize/globalize.git - revision: ce823d437b38472365adc01a6a46f5e1bf6a4080 - branch: master - specs: - globalize (5.1.0.beta2) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) - request_store (~> 1.0) - PATH remote: ../ specs: @@ -36,155 +10,167 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.1.3) - actionpack (= 5.1.3) + actioncable (5.1.7) + actionpack (= 5.1.7) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.3) - actionpack (= 5.1.3) - actionview (= 5.1.3) - activejob (= 5.1.3) + actionmailer (5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.3) - actionview (= 5.1.3) - activesupport (= 5.1.3) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.3) - activesupport (= 5.1.3) + actionview (5.1.7) + activesupport (= 5.1.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.3) - activesupport (= 5.1.3) + activejob (5.1.7) + activesupport (= 5.1.7) globalid (>= 0.3.6) - activemodel (5.1.3) - activesupport (= 5.1.3) - activemodel-serializers-xml (1.0.1) + activemodel (5.1.7) + activesupport (= 5.1.7) + activemodel-serializers-xml (1.0.2) activemodel (> 5.x) - activerecord (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.1.3) - activemodel (= 5.1.3) - activesupport (= 5.1.3) + activerecord (5.1.7) + activemodel (= 5.1.7) + activesupport (= 5.1.7) arel (~> 8.0) - activesupport (5.1.3) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (8.0.0) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) - binding_of_caller (0.7.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + byebug (11.0.1) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.1.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - coderay (1.1.1) - concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) - erubi (1.6.1) - factory_girl (4.8.0) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.0) + globalid (0.4.2) activesupport (>= 4.2.0) - i18n (0.8.6) - json (2.1.0) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - pry (0.10.4) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.5) - rack (2.0.3) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.1.3) - actioncable (= 5.1.3) - actionmailer (= 5.1.3) - actionpack (= 5.1.3) - actionview (= 5.1.3) - activejob (= 5.1.3) - activemodel (= 5.1.3) - activerecord (= 5.1.3) - activesupport (= 5.1.3) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.1.7) + actioncable (= 5.1.7) + actionmailer (= 5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) + activemodel (= 5.1.7) + activerecord (= 5.1.7) + activesupport (= 5.1.7) bundler (>= 1.3.0) - railties (= 5.1.3) + railties (= 5.1.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.1.3) - actionpack (= 5.1.3) - activesupport (= 5.1.3) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) - request_store (1.3.2) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -202,55 +188,52 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.19.4) + sqlite3 (1.4.1) + thor (0.20.3) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.1.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES - activeresource! appraisal - capybara + capybara (< 3.16) capybara-screenshot carrierwave database_cleaner factory_girl faker generator_spec - globalize! nocms-blocks! pry-byebug pry-nav pry-rails pry-remote pry-stack_explorer - rails (= 5.1.3) - rails-observers! + rails (= 5.1.7) rspec-rails (~> 3.5.0.beta) simplecov simplecov-json From 3a3174a4329c6b754afb6cd5b9e06e220168a20f Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Tue, 28 May 2019 21:25:18 +0200 Subject: [PATCH 06/11] Change to adapt to scopes in Rails 5.2 --- .../no_cms/blocks/concerns/translation_scopes.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/models/no_cms/blocks/concerns/translation_scopes.rb b/app/models/no_cms/blocks/concerns/translation_scopes.rb index 22abd41..6373375 100644 --- a/app/models/no_cms/blocks/concerns/translation_scopes.rb +++ b/app/models/no_cms/blocks/concerns/translation_scopes.rb @@ -6,7 +6,16 @@ module TranslationScopes included do scope :where_with_locale, ->(where_params, locale = ::I18n.locale) { - with_translations(locale).where(self::Translation.table_name => where_params) + # In Rails 5.2 "self" doesn't return the model itself but an + # ActiveRecord::Relation model that has no Translation. We have to + # use the `model` attribute + translation_model = if Rails.version >= "5.2.0" + self.model::Translation + else + self::Translation + end + + with_translations(locale).where(translation_model.table_name => where_params) } end From 03ebce25a75377d2686b205c58201bf007f8adc9 Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Tue, 28 May 2019 21:39:02 +0200 Subject: [PATCH 07/11] Added Appraisals for Rails 5.2.3 in the three supported databases --- Appraisals | 15 ++ Gemfile.lock | 23 ++- blocks.gemspec | 6 +- gemfiles/rails_4_0_mysql.gemfile.lock | 10 +- gemfiles/rails_4_0_pgsql.gemfile.lock | 6 +- gemfiles/rails_4_0_sqlite.gemfile.lock | 6 +- gemfiles/rails_4_1_mysql.gemfile.lock | 10 +- gemfiles/rails_4_1_pgsql.gemfile.lock | 6 +- gemfiles/rails_4_1_sqlite.gemfile.lock | 6 +- gemfiles/rails_4_2_mysql.gemfile.lock | 6 +- gemfiles/rails_4_2_pgsql.gemfile.lock | 12 +- gemfiles/rails_4_2_sqlite.gemfile.lock | 12 +- gemfiles/rails_5_0_mysql.gemfile.lock | 6 +- gemfiles/rails_5_0_pgsql.gemfile.lock | 12 +- gemfiles/rails_5_0_sqlite.gemfile.lock | 12 +- gemfiles/rails_5_1_mysql.gemfile.lock | 6 +- gemfiles/rails_5_1_pgsql.gemfile.lock | 12 +- gemfiles/rails_5_1_sqlite.gemfile.lock | 12 +- gemfiles/rails_5_2_mysql.gemfile | 30 +++ gemfiles/rails_5_2_mysql.gemfile.lock | 251 +++++++++++++++++++++++++ gemfiles/rails_5_2_pgsql.gemfile | 30 +++ gemfiles/rails_5_2_pgsql.gemfile.lock | 251 +++++++++++++++++++++++++ gemfiles/rails_5_2_sqlite.gemfile | 30 +++ gemfiles/rails_5_2_sqlite.gemfile.lock | 251 +++++++++++++++++++++++++ 24 files changed, 941 insertions(+), 80 deletions(-) create mode 100644 gemfiles/rails_5_2_mysql.gemfile create mode 100644 gemfiles/rails_5_2_mysql.gemfile.lock create mode 100644 gemfiles/rails_5_2_pgsql.gemfile create mode 100644 gemfiles/rails_5_2_pgsql.gemfile.lock create mode 100644 gemfiles/rails_5_2_sqlite.gemfile create mode 100644 gemfiles/rails_5_2_sqlite.gemfile.lock diff --git a/Appraisals b/Appraisals index b9d7d3b..ba65dd4 100644 --- a/Appraisals +++ b/Appraisals @@ -24,6 +24,11 @@ appraise "rails-5-1-mysql" do gem 'rails', '5.1.7' end +appraise "rails-5-2-mysql" do + gem "mysql2" + gem 'rails', '5.2.3' +end + appraise "rails-4-0-pgsql" do gem "pg", '~> 0.21.0' gem "rails", "4.0.13" @@ -50,6 +55,11 @@ appraise "rails-5-1-pgsql" do gem 'rails', '5.1.7' end +appraise "rails-5-2-pgsql" do + gem "pg" + gem 'rails', '5.2.3' +end + appraise "rails-4-0-sqlite" do gem "sqlite3", '~> 1.3.13' gem "rails", "4.0.13" @@ -75,3 +85,8 @@ appraise "rails-5-1-sqlite" do gem "sqlite3" gem 'rails', '5.1.7' end + +appraise "rails-5-2-sqlite" do + gem "sqlite3" + gem 'rails', '5.2.3' +end diff --git a/Gemfile.lock b/Gemfile.lock index ce0e49e..eea1f9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,10 +2,10 @@ PATH remote: . specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ @@ -56,8 +56,8 @@ GEM rake thor (>= 0.14.0) arel (6.0.4) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) @@ -79,7 +79,7 @@ GEM mime-types (>= 1.16) mimemagic (>= 0.3.0) coderay (1.1.1) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) database_cleaner (1.5.3) debug_inspector (0.0.2) diff-lcs (1.2.5) @@ -92,11 +92,12 @@ GEM generator_spec (0.9.3) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.0.1) - activemodel (>= 4.2.0, < 4.3) - activerecord (>= 4.2.0, < 4.3) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) i18n (0.7.0) json (1.8.3) launchy (2.4.3) @@ -163,6 +164,8 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.0.0) + request_store (1.4.1) + rack (>= 1.4) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff --git a/blocks.gemspec b/blocks.gemspec index 5db3d03..bf210a9 100644 --- a/blocks.gemspec +++ b/blocks.gemspec @@ -16,9 +16,9 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "CHANGELOG", "LICENSE", "Rakefile", "README.md"] s.test_files = Dir["spec/**/*"] - s.add_dependency "rails", ">= 4.0.0", '< 5.2' - s.add_dependency "activeresource", ">= 4.0.0", '< 5.2' - s.add_dependency "globalize", '>= 4.0.0', '< 5.2' + s.add_dependency "rails", ">= 4.0.0", '< 5.3' + s.add_dependency "activeresource", ">= 4.0.0", '< 5.3' + s.add_dependency "globalize", '>= 4.0.0', '< 5.3' s.add_dependency "awesome_nested_set", '>= 3.0.0', '< 3.2' end diff --git a/gemfiles/rails_4_0_mysql.gemfile.lock b/gemfiles/rails_4_0_mysql.gemfile.lock index ca58d43..f30af2c 100644 --- a/gemfiles/rails_4_0_mysql.gemfile.lock +++ b/gemfiles/rails_4_0_mysql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ @@ -45,8 +45,8 @@ GEM rake thor (>= 0.14.0) arel (4.0.2) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.1.4) diff --git a/gemfiles/rails_4_0_pgsql.gemfile.lock b/gemfiles/rails_4_0_pgsql.gemfile.lock index ae8c638..7784632 100644 --- a/gemfiles/rails_4_0_pgsql.gemfile.lock +++ b/gemfiles/rails_4_0_pgsql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_4_0_sqlite.gemfile.lock b/gemfiles/rails_4_0_sqlite.gemfile.lock index 7eba520..e70957f 100644 --- a/gemfiles/rails_4_0_sqlite.gemfile.lock +++ b/gemfiles/rails_4_0_sqlite.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_4_1_mysql.gemfile.lock b/gemfiles/rails_4_1_mysql.gemfile.lock index 44e96a8..eac115e 100644 --- a/gemfiles/rails_4_1_mysql.gemfile.lock +++ b/gemfiles/rails_4_1_mysql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ @@ -47,8 +47,8 @@ GEM rake thor (>= 0.14.0) arel (5.0.1.20140414130214) - awesome_nested_set (3.1.3) - activerecord (>= 4.0.0, < 5.2) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.3) diff --git a/gemfiles/rails_4_1_pgsql.gemfile.lock b/gemfiles/rails_4_1_pgsql.gemfile.lock index 05b1a63..aaacc76 100644 --- a/gemfiles/rails_4_1_pgsql.gemfile.lock +++ b/gemfiles/rails_4_1_pgsql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_4_1_sqlite.gemfile.lock b/gemfiles/rails_4_1_sqlite.gemfile.lock index e1c4c15..c95e4b9 100644 --- a/gemfiles/rails_4_1_sqlite.gemfile.lock +++ b/gemfiles/rails_4_1_sqlite.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_4_2_mysql.gemfile.lock b/gemfiles/rails_4_2_mysql.gemfile.lock index 87dfb68..dcc4055 100644 --- a/gemfiles/rails_4_2_mysql.gemfile.lock +++ b/gemfiles/rails_4_2_mysql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_4_2_pgsql.gemfile.lock b/gemfiles/rails_4_2_pgsql.gemfile.lock index a2e700c..84ae47e 100644 --- a/gemfiles/rails_4_2_pgsql.gemfile.lock +++ b/gemfiles/rails_4_2_pgsql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ @@ -93,9 +93,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (0.9.5) concurrent-ruby (~> 1.0) diff --git a/gemfiles/rails_4_2_sqlite.gemfile.lock b/gemfiles/rails_4_2_sqlite.gemfile.lock index 3a48461..88901f7 100644 --- a/gemfiles/rails_4_2_sqlite.gemfile.lock +++ b/gemfiles/rails_4_2_sqlite.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ @@ -93,9 +93,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (0.9.5) concurrent-ruby (~> 1.0) diff --git a/gemfiles/rails_5_0_mysql.gemfile.lock b/gemfiles/rails_5_0_mysql.gemfile.lock index f222377..6273a45 100644 --- a/gemfiles/rails_5_0_mysql.gemfile.lock +++ b/gemfiles/rails_5_0_mysql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_5_0_pgsql.gemfile.lock b/gemfiles/rails_5_0_pgsql.gemfile.lock index bc68bca..1162387 100644 --- a/gemfiles/rails_5_0_pgsql.gemfile.lock +++ b/gemfiles/rails_5_0_pgsql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) diff --git a/gemfiles/rails_5_0_sqlite.gemfile.lock b/gemfiles/rails_5_0_sqlite.gemfile.lock index dedc6db..11dae2d 100644 --- a/gemfiles/rails_5_0_sqlite.gemfile.lock +++ b/gemfiles/rails_5_0_sqlite.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) diff --git a/gemfiles/rails_5_1_mysql.gemfile.lock b/gemfiles/rails_5_1_mysql.gemfile.lock index 5ee8452..e9bf502 100644 --- a/gemfiles/rails_5_1_mysql.gemfile.lock +++ b/gemfiles/rails_5_1_mysql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_5_1_pgsql.gemfile.lock b/gemfiles/rails_5_1_pgsql.gemfile.lock index 05961c0..4f6803a 100644 --- a/gemfiles/rails_5_1_pgsql.gemfile.lock +++ b/gemfiles/rails_5_1_pgsql.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) diff --git a/gemfiles/rails_5_1_sqlite.gemfile.lock b/gemfiles/rails_5_1_sqlite.gemfile.lock index f39b2df..f0d0e26 100644 --- a/gemfiles/rails_5_1_sqlite.gemfile.lock +++ b/gemfiles/rails_5_1_sqlite.gemfile.lock @@ -2,10 +2,10 @@ PATH remote: ../ specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.2) + activeresource (>= 4.0.0, < 5.3) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.2) - rails (>= 4.0.0, < 5.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) diff --git a/gemfiles/rails_5_2_mysql.gemfile b/gemfiles/rails_5_2_mysql.gemfile new file mode 100644 index 0000000..8897339 --- /dev/null +++ b/gemfiles/rails_5_2_mysql.gemfile @@ -0,0 +1,30 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "mysql2" +gem "rails", "5.2.3" + +group :development, :test do + gem "pry-rails" + gem "pry-byebug" + gem "pry-nav" + gem "pry-remote" + gem "pry-stack_explorer" +end + +group :test do + gem "rspec-rails", "~> 3.5.0.beta" + gem "capybara-screenshot" + gem "factory_girl" + gem "capybara", "< 3.16" + gem "database_cleaner" + gem "faker" + gem "carrierwave" + gem "appraisal" + gem "simplecov" + gem "simplecov-json" + gem "generator_spec" +end + +gemspec path: "../" diff --git a/gemfiles/rails_5_2_mysql.gemfile.lock b/gemfiles/rails_5_2_mysql.gemfile.lock new file mode 100644 index 0000000..8bd9d24 --- /dev/null +++ b/gemfiles/rails_5_2_mysql.gemfile.lock @@ -0,0 +1,251 @@ +PATH + remote: ../ + specs: + nocms-blocks (1.2.0) + activeresource (>= 4.0.0, < 5.3) + awesome_nested_set (>= 3.0.0, < 3.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + arel (9.0.0) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) + launchy (2.4.3) + addressable (~> 2.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mysql2 (0.5.2) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-json (0.2) + json + simplecov + slop (3.6.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + capybara (< 3.16) + capybara-screenshot + carrierwave + database_cleaner + factory_girl + faker + generator_spec + mysql2 + nocms-blocks! + pry-byebug + pry-nav + pry-rails + pry-remote + pry-stack_explorer + rails (= 5.2.3) + rspec-rails (~> 3.5.0.beta) + simplecov + simplecov-json + +BUNDLED WITH + 1.13.6 diff --git a/gemfiles/rails_5_2_pgsql.gemfile b/gemfiles/rails_5_2_pgsql.gemfile new file mode 100644 index 0000000..4e377d2 --- /dev/null +++ b/gemfiles/rails_5_2_pgsql.gemfile @@ -0,0 +1,30 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "pg" +gem "rails", "5.2.3" + +group :development, :test do + gem "pry-rails" + gem "pry-byebug" + gem "pry-nav" + gem "pry-remote" + gem "pry-stack_explorer" +end + +group :test do + gem "rspec-rails", "~> 3.5.0.beta" + gem "capybara-screenshot" + gem "factory_girl" + gem "capybara", "< 3.16" + gem "database_cleaner" + gem "faker" + gem "carrierwave" + gem "appraisal" + gem "simplecov" + gem "simplecov-json" + gem "generator_spec" +end + +gemspec path: "../" diff --git a/gemfiles/rails_5_2_pgsql.gemfile.lock b/gemfiles/rails_5_2_pgsql.gemfile.lock new file mode 100644 index 0000000..59f3b5b --- /dev/null +++ b/gemfiles/rails_5_2_pgsql.gemfile.lock @@ -0,0 +1,251 @@ +PATH + remote: ../ + specs: + nocms-blocks (1.2.0) + activeresource (>= 4.0.0, < 5.3) + awesome_nested_set (>= 3.0.0, < 3.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + arel (9.0.0) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) + launchy (2.4.3) + addressable (~> 2.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-json (0.2) + json + simplecov + slop (3.6.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + capybara (< 3.16) + capybara-screenshot + carrierwave + database_cleaner + factory_girl + faker + generator_spec + nocms-blocks! + pg + pry-byebug + pry-nav + pry-rails + pry-remote + pry-stack_explorer + rails (= 5.2.3) + rspec-rails (~> 3.5.0.beta) + simplecov + simplecov-json + +BUNDLED WITH + 1.13.6 diff --git a/gemfiles/rails_5_2_sqlite.gemfile b/gemfiles/rails_5_2_sqlite.gemfile new file mode 100644 index 0000000..5188154 --- /dev/null +++ b/gemfiles/rails_5_2_sqlite.gemfile @@ -0,0 +1,30 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sqlite3" +gem "rails", "5.2.3" + +group :development, :test do + gem "pry-rails" + gem "pry-byebug" + gem "pry-nav" + gem "pry-remote" + gem "pry-stack_explorer" +end + +group :test do + gem "rspec-rails", "~> 3.5.0.beta" + gem "capybara-screenshot" + gem "factory_girl" + gem "capybara", "< 3.16" + gem "database_cleaner" + gem "faker" + gem "carrierwave" + gem "appraisal" + gem "simplecov" + gem "simplecov-json" + gem "generator_spec" +end + +gemspec path: "../" diff --git a/gemfiles/rails_5_2_sqlite.gemfile.lock b/gemfiles/rails_5_2_sqlite.gemfile.lock new file mode 100644 index 0000000..3aec03a --- /dev/null +++ b/gemfiles/rails_5_2_sqlite.gemfile.lock @@ -0,0 +1,251 @@ +PATH + remote: ../ + specs: + nocms-blocks (1.2.0) + activeresource (>= 4.0.0, < 5.3) + awesome_nested_set (>= 3.0.0, < 3.2) + globalize (>= 4.0.0, < 5.3) + rails (>= 4.0.0, < 5.3) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + arel (9.0.0) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) + launchy (2.4.3) + addressable (~> 2.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-json (0.2) + json + simplecov + slop (3.6.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.4.1) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + capybara (< 3.16) + capybara-screenshot + carrierwave + database_cleaner + factory_girl + faker + generator_spec + nocms-blocks! + pry-byebug + pry-nav + pry-rails + pry-remote + pry-stack_explorer + rails (= 5.2.3) + rspec-rails (~> 3.5.0.beta) + simplecov + simplecov-json + sqlite3 + +BUNDLED WITH + 1.13.6 From 17eca364ea391b2c661d296ce762e7ac2674005b Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Tue, 28 May 2019 21:39:36 +0200 Subject: [PATCH 08/11] Removed sqlite warning --- spec/dummy/config/application.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index 35e97e8..8b3aba7 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -18,6 +18,10 @@ class Application < Rails::Application # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de config.i18n.available_locales = [:en, :es, :fr, :pt, :de, :ca, :it] + + if NoCms::Blocks.installed_db_gem == "sqlite3" && Rails.version >= "5.2.0" + Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true + end end end From 06ced33fe519537df386974ef5e434d90f47b22d Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Tue, 28 May 2019 23:14:54 +0200 Subject: [PATCH 09/11] Created appraisals for Rails 6 --- Appraisals | 30 +++ Gemfile | 2 +- Gemfile.lock | 274 ++++++++++++----------- blocks.gemspec | 6 +- gemfiles/rails_4_0_mysql.gemfile | 2 +- gemfiles/rails_4_0_mysql.gemfile.lock | 105 +++++---- gemfiles/rails_4_0_pgsql.gemfile | 2 +- gemfiles/rails_4_0_pgsql.gemfile.lock | 46 ++-- gemfiles/rails_4_0_sqlite.gemfile | 2 +- gemfiles/rails_4_0_sqlite.gemfile.lock | 46 ++-- gemfiles/rails_4_1_mysql.gemfile | 2 +- gemfiles/rails_4_1_mysql.gemfile.lock | 101 +++++---- gemfiles/rails_4_1_pgsql.gemfile | 2 +- gemfiles/rails_4_1_pgsql.gemfile.lock | 44 ++-- gemfiles/rails_4_1_sqlite.gemfile | 2 +- gemfiles/rails_4_1_sqlite.gemfile.lock | 44 ++-- gemfiles/rails_4_2_mysql.gemfile | 2 +- gemfiles/rails_4_2_mysql.gemfile.lock | 42 ++-- gemfiles/rails_4_2_pgsql.gemfile | 2 +- gemfiles/rails_4_2_pgsql.gemfile.lock | 42 ++-- gemfiles/rails_4_2_sqlite.gemfile | 2 +- gemfiles/rails_4_2_sqlite.gemfile.lock | 42 ++-- gemfiles/rails_5_0_mysql.gemfile | 2 +- gemfiles/rails_5_0_mysql.gemfile.lock | 42 ++-- gemfiles/rails_5_0_pgsql.gemfile | 2 +- gemfiles/rails_5_0_pgsql.gemfile.lock | 42 ++-- gemfiles/rails_5_0_sqlite.gemfile | 2 +- gemfiles/rails_5_0_sqlite.gemfile.lock | 42 ++-- gemfiles/rails_5_1_mysql.gemfile | 2 +- gemfiles/rails_5_1_mysql.gemfile.lock | 42 ++-- gemfiles/rails_5_1_pgsql.gemfile | 2 +- gemfiles/rails_5_1_pgsql.gemfile.lock | 42 ++-- gemfiles/rails_5_1_sqlite.gemfile | 2 +- gemfiles/rails_5_1_sqlite.gemfile.lock | 42 ++-- gemfiles/rails_5_2_mysql.gemfile | 2 +- gemfiles/rails_5_2_mysql.gemfile.lock | 42 ++-- gemfiles/rails_5_2_pgsql.gemfile | 2 +- gemfiles/rails_5_2_pgsql.gemfile.lock | 42 ++-- gemfiles/rails_5_2_sqlite.gemfile | 2 +- gemfiles/rails_5_2_sqlite.gemfile.lock | 42 ++-- gemfiles/rails_6_rc_mysql.gemfile | 32 +++ gemfiles/rails_6_rc_mysql.gemfile.lock | 274 +++++++++++++++++++++++ gemfiles/rails_6_rc_pgsql.gemfile | 36 +++ gemfiles/rails_6_rc_pgsql.gemfile.lock | 278 ++++++++++++++++++++++++ gemfiles/rails_6_rc_sqlite.gemfile | 36 +++ gemfiles/rails_6_rc_sqlite.gemfile.lock | 278 ++++++++++++++++++++++++ 46 files changed, 1575 insertions(+), 597 deletions(-) create mode 100644 gemfiles/rails_6_rc_mysql.gemfile create mode 100644 gemfiles/rails_6_rc_mysql.gemfile.lock create mode 100644 gemfiles/rails_6_rc_pgsql.gemfile create mode 100644 gemfiles/rails_6_rc_pgsql.gemfile.lock create mode 100644 gemfiles/rails_6_rc_sqlite.gemfile create mode 100644 gemfiles/rails_6_rc_sqlite.gemfile.lock diff --git a/Appraisals b/Appraisals index ba65dd4..de999d4 100644 --- a/Appraisals +++ b/Appraisals @@ -29,6 +29,13 @@ appraise "rails-5-2-mysql" do gem 'rails', '5.2.3' end +appraise "rails-6-rc-mysql" do + gem "mysql2" + gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git' + gem 'actionpack', '6.0.0.rc1' + gem 'rails', '6.0.0.rc1' +end + appraise "rails-4-0-pgsql" do gem "pg", '~> 0.21.0' gem "rails", "4.0.13" @@ -60,6 +67,17 @@ appraise "rails-5-2-pgsql" do gem 'rails', '5.2.3' end +appraise "rails-6-rc-pgsql" do + gem "pg" + gem 'rails', '6.0.0.rc1' + gem 'actionpack', '6.0.0.rc1' + gem 'activemodel', '6.0.0.rc1' + gem 'activerecord', '6.0.0.rc1' + gem 'activesupport', '6.0.0.rc1' + gem 'railties', '6.0.0.rc1' + gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git' +end + appraise "rails-4-0-sqlite" do gem "sqlite3", '~> 1.3.13' gem "rails", "4.0.13" @@ -90,3 +108,15 @@ appraise "rails-5-2-sqlite" do gem "sqlite3" gem 'rails', '5.2.3' end + +appraise "rails-6-rc-sqlite" do + gem "sqlite3" + gem 'rails', '6.0.0.rc1' + + gem 'actionpack', '6.0.0.rc1' + gem 'activemodel', '6.0.0.rc1' + gem 'activerecord', '6.0.0.rc1' + gem 'activesupport', '6.0.0.rc1' + gem 'railties', '6.0.0.rc1' + gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git' +end diff --git a/Gemfile b/Gemfile index 295a434..86adc7f 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ group :development, :test do end group :test do - gem 'rspec-rails', '~> 3.5.0.beta' + gem 'rspec-rails' gem 'capybara-screenshot' gem 'factory_girl' gem 'capybara', '< 3.16' diff --git a/Gemfile.lock b/Gemfile.lock index eea1f9d..f307c8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,168 +2,181 @@ PATH remote: . specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.7.1) - actionview (= 4.2.7.1) - activesupport (= 4.2.7.1) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.7.1) - activesupport (= 4.2.7.1) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.7.1) - activesupport (= 4.2.7.1) - globalid (>= 0.3.0) - activemodel (4.2.7.1) - activesupport (= 4.2.7.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) builder (~> 3.1) - activerecord (4.2.7.1) - activemodel (= 4.2.7.1) - activesupport (= 4.2.7.1) - arel (~> 6.0) - activeresource (4.1.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.2) - activesupport (4.2.7.1) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) - arel (6.0.4) + arel (9.0.0) awesome_nested_set (3.1.4) activerecord (>= 4.0.0, < 5.3) - binding_of_caller (0.7.2) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - builder (3.2.2) - byebug (9.0.6) - capybara (2.10.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.14) - capybara (>= 1.0, < 3) + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (0.11.2) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) - mimemagic (>= 0.3.0) - coderay (1.1.1) + coderay (1.1.2) concurrent-ruby (1.1.5) - database_cleaner (1.5.3) - debug_inspector (0.0.2) - diff-lcs (1.2.5) - docile (1.1.5) - erubis (2.7.0) - factory_girl (4.7.0) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.6.6) - i18n (~> 0.5) - generator_spec (0.9.3) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) - i18n (0.7.0) - json (1.8.3) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - method_source (0.8.2) - mime-types (3.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) mini_mime (1.0.1) - mini_portile2 (2.1.0) - minitest (5.9.1) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) - pry (0.10.4) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.0) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.4) - pry (>= 0.9.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (2.0.4) - rack (1.6.5) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.7.1) - actionmailer (= 4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) - activemodel (= 4.2.7.1) - activerecord (= 4.2.7.1) - activesupport (= 4.2.7.1) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.7.1) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - rails-observers (0.1.5) - activemodel (>= 4.0) - railties (4.2.7.1) - actionpack (= 4.2.7.1) - activesupport (= 4.2.7.1) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (12.0.0) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) rspec-core (3.5.4) @@ -183,11 +196,11 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - simplecov (0.12.0) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) simplecov-json (0.2) json simplecov @@ -199,12 +212,15 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - thor (0.19.4) - thread_safe (0.3.5) - tzinfo (1.2.2) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) thread_safe (~> 0.1) - xpath (2.0.0) - nokogiri (~> 1.3) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -224,9 +240,9 @@ DEPENDENCIES pry-rails pry-remote pry-stack_explorer - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/blocks.gemspec b/blocks.gemspec index bf210a9..0b49b9d 100644 --- a/blocks.gemspec +++ b/blocks.gemspec @@ -16,9 +16,9 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "CHANGELOG", "LICENSE", "Rakefile", "README.md"] s.test_files = Dir["spec/**/*"] - s.add_dependency "rails", ">= 4.0.0", '< 5.3' - s.add_dependency "activeresource", ">= 4.0.0", '< 5.3' - s.add_dependency "globalize", '>= 4.0.0', '< 5.3' + s.add_dependency "rails", ">= 4.0.0", '< 6.1' + s.add_dependency "activeresource", ">= 4.0.0", '< 6.1' + s.add_dependency "globalize", '>= 4.0.0', '< 5.4' s.add_dependency "awesome_nested_set", '>= 3.0.0', '< 3.2' end diff --git a/gemfiles/rails_4_0_mysql.gemfile b/gemfiles/rails_4_0_mysql.gemfile index be22746..bbb1918 100644 --- a/gemfiles/rails_4_0_mysql.gemfile +++ b/gemfiles/rails_4_0_mysql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_0_mysql.gemfile.lock b/gemfiles/rails_4_0_mysql.gemfile.lock index f30af2c..e54ebcd 100644 --- a/gemfiles/rails_4_0_mysql.gemfile.lock +++ b/gemfiles/rails_4_0_mysql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -38,7 +38,7 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler @@ -47,35 +47,35 @@ GEM arel (4.0.2) awesome_nested_set (3.1.4) activerecord (>= 4.0.0, < 5.3) - binding_of_caller (0.7.2) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.1.4) - byebug (9.1.0) - capybara (2.15.4) + byebug (11.0.1) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + xpath (>= 2.0, < 4.0) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.2.1) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) coderay (1.1.2) - concurrent-ruby (1.1.4) - database_cleaner (1.6.2) + concurrent-ruby (1.1.5) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) @@ -84,40 +84,39 @@ GEM activerecord (>= 4.0.0, < 5) i18n (0.9.5) concurrent-ruby (~> 1.0) - json (2.1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) mail (2.7.1) mini_mime (>= 0.1.1) - method_source (0.8.2) - mime-types (3.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2019.0331) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (4.7.5) multi_json (1.13.1) mysql2 (0.3.21) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - pry (0.10.4) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.5.0) - byebug (~> 9.1) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (3.0.0) + public_suffix (3.1.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -137,25 +136,25 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) - simplecov (0.15.1) - docile (~> 1.1.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) @@ -172,9 +171,9 @@ GEM sprockets (>= 2.8, < 4.0) thor (0.20.3) thread_safe (0.3.6) - tzinfo (0.3.53) - xpath (2.1.0) - nokogiri (~> 1.3) + tzinfo (0.3.55) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -196,9 +195,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.0.13) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_4_0_pgsql.gemfile b/gemfiles/rails_4_0_pgsql.gemfile index b9fa3d3..fc1a61a 100644 --- a/gemfiles/rails_4_0_pgsql.gemfile +++ b/gemfiles/rails_4_0_pgsql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_0_pgsql.gemfile.lock b/gemfiles/rails_4_0_pgsql.gemfile.lock index 7784632..00c046d 100644 --- a/gemfiles/rails_4_0_pgsql.gemfile.lock +++ b/gemfiles/rails_4_0_pgsql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -51,13 +51,13 @@ GEM debug_inspector (>= 0.0.1) builder (3.1.4) byebug (11.0.1) - capybara (2.15.4) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy @@ -136,23 +136,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -171,9 +171,9 @@ GEM sprockets (>= 2.8, < 4.0) thor (0.20.3) thread_safe (0.3.6) - tzinfo (0.3.53) - xpath (2.1.0) - nokogiri (~> 1.3) + tzinfo (0.3.55) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -195,9 +195,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.0.13) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_4_0_sqlite.gemfile b/gemfiles/rails_4_0_sqlite.gemfile index 0336b60..a5c5d2f 100644 --- a/gemfiles/rails_4_0_sqlite.gemfile +++ b/gemfiles/rails_4_0_sqlite.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_0_sqlite.gemfile.lock b/gemfiles/rails_4_0_sqlite.gemfile.lock index e70957f..a52b1a5 100644 --- a/gemfiles/rails_4_0_sqlite.gemfile.lock +++ b/gemfiles/rails_4_0_sqlite.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -51,13 +51,13 @@ GEM debug_inspector (>= 0.0.1) builder (3.1.4) byebug (11.0.1) - capybara (2.15.4) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy @@ -135,23 +135,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -171,9 +171,9 @@ GEM sqlite3 (1.3.13) thor (0.20.3) thread_safe (0.3.6) - tzinfo (0.3.53) - xpath (2.1.0) - nokogiri (~> 1.3) + tzinfo (0.3.55) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -194,10 +194,10 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.0.13) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json sqlite3 (~> 1.3.13) BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_4_1_mysql.gemfile b/gemfiles/rails_4_1_mysql.gemfile index ded5b8e..1d7e03a 100644 --- a/gemfiles/rails_4_1_mysql.gemfile +++ b/gemfiles/rails_4_1_mysql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_1_mysql.gemfile.lock b/gemfiles/rails_4_1_mysql.gemfile.lock index eac115e..a6006c4 100644 --- a/gemfiles/rails_4_1_mysql.gemfile.lock +++ b/gemfiles/rails_4_1_mysql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -40,7 +40,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) appraisal (2.2.0) bundler @@ -49,35 +49,35 @@ GEM arel (5.0.1.20140414130214) awesome_nested_set (3.1.4) activerecord (>= 4.0.0, < 5.3) - binding_of_caller (0.7.2) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.1.0) - capybara (2.15.4) + byebug (11.0.1) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.17) - capybara (>= 1.0, < 3) + xpath (>= 2.0, < 4.0) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.2.1) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) coderay (1.1.2) - concurrent-ruby (1.1.4) - database_cleaner (1.6.2) + concurrent-ruby (1.1.5) + database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) erubis (2.7.0) factory_girl (4.9.0) activesupport (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.9.3) + i18n (>= 0.7) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) @@ -91,34 +91,33 @@ GEM addressable (~> 2.3) mail (2.7.1) mini_mime (>= 0.1.1) - method_source (0.8.2) - mime-types (3.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2019.0331) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) mysql2 (0.3.21) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - pry (0.10.4) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.5.0) - byebug (~> 9.1) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.6) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) - pry-stack_explorer (0.4.9.2) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (3.0.0) + public_suffix (3.1.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -140,25 +139,25 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) - simplecov (0.15.1) - docile (~> 1.1.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) @@ -177,8 +176,8 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -200,9 +199,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.1.16) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_4_1_pgsql.gemfile b/gemfiles/rails_4_1_pgsql.gemfile index 1a2cce8..ed13cfc 100644 --- a/gemfiles/rails_4_1_pgsql.gemfile +++ b/gemfiles/rails_4_1_pgsql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_1_pgsql.gemfile.lock b/gemfiles/rails_4_1_pgsql.gemfile.lock index aaacc76..645fb0a 100644 --- a/gemfiles/rails_4_1_pgsql.gemfile.lock +++ b/gemfiles/rails_4_1_pgsql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -53,13 +53,13 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (11.0.1) - capybara (2.15.4) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy @@ -139,23 +139,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -176,8 +176,8 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -199,9 +199,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.1.16) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_4_1_sqlite.gemfile b/gemfiles/rails_4_1_sqlite.gemfile index 11c3967..a726a3b 100644 --- a/gemfiles/rails_4_1_sqlite.gemfile +++ b/gemfiles/rails_4_1_sqlite.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_1_sqlite.gemfile.lock b/gemfiles/rails_4_1_sqlite.gemfile.lock index c95e4b9..75e4f8d 100644 --- a/gemfiles/rails_4_1_sqlite.gemfile.lock +++ b/gemfiles/rails_4_1_sqlite.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -53,13 +53,13 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (11.0.1) - capybara (2.15.4) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy @@ -138,23 +138,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -176,8 +176,8 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -198,10 +198,10 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.1.16) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json sqlite3 (~> 1.3.13) BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_4_2_mysql.gemfile b/gemfiles/rails_4_2_mysql.gemfile index 5d3c165..180b986 100644 --- a/gemfiles/rails_4_2_mysql.gemfile +++ b/gemfiles/rails_4_2_mysql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_2_mysql.gemfile.lock b/gemfiles/rails_4_2_mysql.gemfile.lock index dcc4055..dcd604e 100644 --- a/gemfiles/rails_4_2_mysql.gemfile.lock +++ b/gemfiles/rails_4_2_mysql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -93,9 +93,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -167,23 +167,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -227,9 +227,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.2.11.1) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_4_2_pgsql.gemfile b/gemfiles/rails_4_2_pgsql.gemfile index fbf6aa1..bc6878f 100644 --- a/gemfiles/rails_4_2_pgsql.gemfile +++ b/gemfiles/rails_4_2_pgsql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_2_pgsql.gemfile.lock b/gemfiles/rails_4_2_pgsql.gemfile.lock index 84ae47e..f856867 100644 --- a/gemfiles/rails_4_2_pgsql.gemfile.lock +++ b/gemfiles/rails_4_2_pgsql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -93,9 +93,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.2.0) - activemodel (>= 4.2, < 5.3) - activerecord (>= 4.2, < 5.3) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -167,23 +167,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -227,9 +227,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.2.11.1) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_4_2_sqlite.gemfile b/gemfiles/rails_4_2_sqlite.gemfile index 10fc7e8..f0c2618 100644 --- a/gemfiles/rails_4_2_sqlite.gemfile +++ b/gemfiles/rails_4_2_sqlite.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_2_sqlite.gemfile.lock b/gemfiles/rails_4_2_sqlite.gemfile.lock index 88901f7..0c6eb86 100644 --- a/gemfiles/rails_4_2_sqlite.gemfile.lock +++ b/gemfiles/rails_4_2_sqlite.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -93,9 +93,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.2.0) - activemodel (>= 4.2, < 5.3) - activerecord (>= 4.2, < 5.3) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -166,23 +166,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -226,10 +226,10 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.2.11.1) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json sqlite3 (~> 1.3.13) BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_0_mysql.gemfile b/gemfiles/rails_5_0_mysql.gemfile index dd7766d..7f53d51 100644 --- a/gemfiles/rails_5_0_mysql.gemfile +++ b/gemfiles/rails_5_0_mysql.gemfile @@ -15,7 +15,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_0_mysql.gemfile.lock b/gemfiles/rails_5_0_mysql.gemfile.lock index 6273a45..0491982 100644 --- a/gemfiles/rails_5_0_mysql.gemfile.lock +++ b/gemfiles/rails_5_0_mysql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -172,23 +172,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -236,9 +236,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 5.0.7.2) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_0_pgsql.gemfile b/gemfiles/rails_5_0_pgsql.gemfile index 9220b72..ec40370 100644 --- a/gemfiles/rails_5_0_pgsql.gemfile +++ b/gemfiles/rails_5_0_pgsql.gemfile @@ -15,7 +15,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_0_pgsql.gemfile.lock b/gemfiles/rails_5_0_pgsql.gemfile.lock index 1162387..68bea2e 100644 --- a/gemfiles/rails_5_0_pgsql.gemfile.lock +++ b/gemfiles/rails_5_0_pgsql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.2.0) - activemodel (>= 4.2, < 5.3) - activerecord (>= 4.2, < 5.3) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -172,23 +172,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -236,9 +236,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 5.0.7.2) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_0_sqlite.gemfile b/gemfiles/rails_5_0_sqlite.gemfile index f552fe6..1c826e5 100644 --- a/gemfiles/rails_5_0_sqlite.gemfile +++ b/gemfiles/rails_5_0_sqlite.gemfile @@ -15,7 +15,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_0_sqlite.gemfile.lock b/gemfiles/rails_5_0_sqlite.gemfile.lock index 11dae2d..baacfb3 100644 --- a/gemfiles/rails_5_0_sqlite.gemfile.lock +++ b/gemfiles/rails_5_0_sqlite.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.2.0) - activemodel (>= 4.2, < 5.3) - activerecord (>= 4.2, < 5.3) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -171,23 +171,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -235,10 +235,10 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 5.0.7.2) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json sqlite3 (~> 1.3.13) BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_1_mysql.gemfile b/gemfiles/rails_5_1_mysql.gemfile index ed5cae0..eedc847 100644 --- a/gemfiles/rails_5_1_mysql.gemfile +++ b/gemfiles/rails_5_1_mysql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_1_mysql.gemfile.lock b/gemfiles/rails_5_1_mysql.gemfile.lock index e9bf502..af82025 100644 --- a/gemfiles/rails_5_1_mysql.gemfile.lock +++ b/gemfiles/rails_5_1_mysql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.1.0) - activemodel (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -172,23 +172,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -235,9 +235,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 5.1.7) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_1_pgsql.gemfile b/gemfiles/rails_5_1_pgsql.gemfile index e5335a8..11058e4 100644 --- a/gemfiles/rails_5_1_pgsql.gemfile +++ b/gemfiles/rails_5_1_pgsql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_1_pgsql.gemfile.lock b/gemfiles/rails_5_1_pgsql.gemfile.lock index 4f6803a..89f3b5f 100644 --- a/gemfiles/rails_5_1_pgsql.gemfile.lock +++ b/gemfiles/rails_5_1_pgsql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.2.0) - activemodel (>= 4.2, < 5.3) - activerecord (>= 4.2, < 5.3) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -172,23 +172,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -235,9 +235,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 5.1.7) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_1_sqlite.gemfile b/gemfiles/rails_5_1_sqlite.gemfile index fe9080f..a05962d 100644 --- a/gemfiles/rails_5_1_sqlite.gemfile +++ b/gemfiles/rails_5_1_sqlite.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_1_sqlite.gemfile.lock b/gemfiles/rails_5_1_sqlite.gemfile.lock index f0d0e26..ca86e20 100644 --- a/gemfiles/rails_5_1_sqlite.gemfile.lock +++ b/gemfiles/rails_5_1_sqlite.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.2.0) - activemodel (>= 4.2, < 5.3) - activerecord (>= 4.2, < 5.3) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -171,23 +171,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -234,10 +234,10 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 5.1.7) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json sqlite3 BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_2_mysql.gemfile b/gemfiles/rails_5_2_mysql.gemfile index 8897339..19472d2 100644 --- a/gemfiles/rails_5_2_mysql.gemfile +++ b/gemfiles/rails_5_2_mysql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_2_mysql.gemfile.lock b/gemfiles/rails_5_2_mysql.gemfile.lock index 8bd9d24..a805d62 100644 --- a/gemfiles/rails_5_2_mysql.gemfile.lock +++ b/gemfiles/rails_5_2_mysql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -104,9 +104,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.2.0) - activemodel (>= 4.2, < 5.3) - activerecord (>= 4.2, < 5.3) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -180,23 +180,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -243,9 +243,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 5.2.3) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_2_pgsql.gemfile b/gemfiles/rails_5_2_pgsql.gemfile index 4e377d2..857d44e 100644 --- a/gemfiles/rails_5_2_pgsql.gemfile +++ b/gemfiles/rails_5_2_pgsql.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_2_pgsql.gemfile.lock b/gemfiles/rails_5_2_pgsql.gemfile.lock index 59f3b5b..fd9c251 100644 --- a/gemfiles/rails_5_2_pgsql.gemfile.lock +++ b/gemfiles/rails_5_2_pgsql.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -104,9 +104,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.2.0) - activemodel (>= 4.2, < 5.3) - activerecord (>= 4.2, < 5.3) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -180,23 +180,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -243,9 +243,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 5.2.3) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_2_sqlite.gemfile b/gemfiles/rails_5_2_sqlite.gemfile index 5188154..a50500f 100644 --- a/gemfiles/rails_5_2_sqlite.gemfile +++ b/gemfiles/rails_5_2_sqlite.gemfile @@ -14,7 +14,7 @@ group :development, :test do end group :test do - gem "rspec-rails", "~> 3.5.0.beta" + gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_2_sqlite.gemfile.lock b/gemfiles/rails_5_2_sqlite.gemfile.lock index 3aec03a..2e79736 100644 --- a/gemfiles/rails_5_2_sqlite.gemfile.lock +++ b/gemfiles/rails_5_2_sqlite.gemfile.lock @@ -1,11 +1,11 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 5.3) + activeresource (>= 4.0.0, < 6.1) awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.3) - rails (>= 4.0.0, < 5.3) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) GEM remote: https://rubygems.org/ @@ -104,9 +104,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.2.0) - activemodel (>= 4.2, < 5.3) - activerecord (>= 4.2, < 5.3) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -179,23 +179,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -242,10 +242,10 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 5.2.3) - rspec-rails (~> 3.5.0.beta) + rspec-rails simplecov simplecov-json sqlite3 BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_6_rc_mysql.gemfile b/gemfiles/rails_6_rc_mysql.gemfile new file mode 100644 index 0000000..851758b --- /dev/null +++ b/gemfiles/rails_6_rc_mysql.gemfile @@ -0,0 +1,32 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "mysql2" +gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git" +gem "actionpack", "6.0.0.rc1" +gem "rails", "6.0.0.rc1" + +group :development, :test do + gem "pry-rails" + gem "pry-byebug" + gem "pry-nav" + gem "pry-remote" + gem "pry-stack_explorer" +end + +group :test do + gem "rspec-rails" + gem "capybara-screenshot" + gem "factory_girl" + gem "capybara", "< 3.16" + gem "database_cleaner" + gem "faker" + gem "carrierwave" + gem "appraisal" + gem "simplecov" + gem "simplecov-json" + gem "generator_spec" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6_rc_mysql.gemfile.lock b/gemfiles/rails_6_rc_mysql.gemfile.lock new file mode 100644 index 0000000..7d57fe1 --- /dev/null +++ b/gemfiles/rails_6_rc_mysql.gemfile.lock @@ -0,0 +1,274 @@ +GIT + remote: git@github.com:collectiveidea/awesome_nested_set.git + revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123 + specs: + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0) + +PATH + remote: .. + specs: + nocms-blocks (1.2.0) + activeresource (>= 4.0.0, < 6.1) + awesome_nested_set (>= 3.0.0, < 3.2) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + mail (>= 2.7.1) + actionmailer (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.0.rc1) + actionview (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actiontext (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + nokogiri (>= 1.8.5) + actionview (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + globalid (>= 0.3.6) + activemodel (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + marcel (~> 0.3.1) + activesupport (6.0.0.rc1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.1, >= 2.1.4) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) + launchy (2.4.3) + addressable (~> 2.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mysql2 (0.5.2) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.0.rc1) + actioncable (= 6.0.0.rc1) + actionmailbox (= 6.0.0.rc1) + actionmailer (= 6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actiontext (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + bundler (>= 1.3.0) + railties (= 6.0.0.rc1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-json (0.2) + json + simplecov + slop (3.6.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.1.6) + +PLATFORMS + ruby + +DEPENDENCIES + actionpack (= 6.0.0.rc1) + appraisal + awesome_nested_set! + capybara (< 3.16) + capybara-screenshot + carrierwave + database_cleaner + factory_girl + faker + generator_spec + mysql2 + nocms-blocks! + pry-byebug + pry-nav + pry-rails + pry-remote + pry-stack_explorer + rails (= 6.0.0.rc1) + rspec-rails + simplecov + simplecov-json + +BUNDLED WITH + 1.17.3 diff --git a/gemfiles/rails_6_rc_pgsql.gemfile b/gemfiles/rails_6_rc_pgsql.gemfile new file mode 100644 index 0000000..4be8a8e --- /dev/null +++ b/gemfiles/rails_6_rc_pgsql.gemfile @@ -0,0 +1,36 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "pg" +gem "rails", "6.0.0.rc1" +gem "actionpack", "6.0.0.rc1" +gem "activemodel", "6.0.0.rc1" +gem "activerecord", "6.0.0.rc1" +gem "activesupport", "6.0.0.rc1" +gem "railties", "6.0.0.rc1" +gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git" + +group :development, :test do + gem "pry-rails" + gem "pry-byebug" + gem "pry-nav" + gem "pry-remote" + gem "pry-stack_explorer" +end + +group :test do + gem "rspec-rails" + gem "capybara-screenshot" + gem "factory_girl" + gem "capybara", "< 3.16" + gem "database_cleaner" + gem "faker" + gem "carrierwave" + gem "appraisal" + gem "simplecov" + gem "simplecov-json" + gem "generator_spec" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6_rc_pgsql.gemfile.lock b/gemfiles/rails_6_rc_pgsql.gemfile.lock new file mode 100644 index 0000000..84d7eb7 --- /dev/null +++ b/gemfiles/rails_6_rc_pgsql.gemfile.lock @@ -0,0 +1,278 @@ +GIT + remote: git@github.com:collectiveidea/awesome_nested_set.git + revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123 + specs: + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0) + +PATH + remote: .. + specs: + nocms-blocks (1.2.0) + activeresource (>= 4.0.0, < 6.1) + awesome_nested_set (>= 3.0.0, < 3.2) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + mail (>= 2.7.1) + actionmailer (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.0.rc1) + actionview (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actiontext (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + nokogiri (>= 1.8.5) + actionview (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + globalid (>= 0.3.6) + activemodel (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + marcel (~> 0.3.1) + activesupport (6.0.0.rc1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.1, >= 2.1.4) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) + launchy (2.4.3) + addressable (~> 2.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.0.rc1) + actioncable (= 6.0.0.rc1) + actionmailbox (= 6.0.0.rc1) + actionmailer (= 6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actiontext (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + bundler (>= 1.3.0) + railties (= 6.0.0.rc1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-json (0.2) + json + simplecov + slop (3.6.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.1.6) + +PLATFORMS + ruby + +DEPENDENCIES + actionpack (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + appraisal + awesome_nested_set! + capybara (< 3.16) + capybara-screenshot + carrierwave + database_cleaner + factory_girl + faker + generator_spec + nocms-blocks! + pg + pry-byebug + pry-nav + pry-rails + pry-remote + pry-stack_explorer + rails (= 6.0.0.rc1) + railties (= 6.0.0.rc1) + rspec-rails + simplecov + simplecov-json + +BUNDLED WITH + 1.17.3 diff --git a/gemfiles/rails_6_rc_sqlite.gemfile b/gemfiles/rails_6_rc_sqlite.gemfile new file mode 100644 index 0000000..e7e59c1 --- /dev/null +++ b/gemfiles/rails_6_rc_sqlite.gemfile @@ -0,0 +1,36 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sqlite3" +gem "rails", "6.0.0.rc1" +gem "actionpack", "6.0.0.rc1" +gem "activemodel", "6.0.0.rc1" +gem "activerecord", "6.0.0.rc1" +gem "activesupport", "6.0.0.rc1" +gem "railties", "6.0.0.rc1" +gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git" + +group :development, :test do + gem "pry-rails" + gem "pry-byebug" + gem "pry-nav" + gem "pry-remote" + gem "pry-stack_explorer" +end + +group :test do + gem "rspec-rails" + gem "capybara-screenshot" + gem "factory_girl" + gem "capybara", "< 3.16" + gem "database_cleaner" + gem "faker" + gem "carrierwave" + gem "appraisal" + gem "simplecov" + gem "simplecov-json" + gem "generator_spec" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6_rc_sqlite.gemfile.lock b/gemfiles/rails_6_rc_sqlite.gemfile.lock new file mode 100644 index 0000000..8cdc63a --- /dev/null +++ b/gemfiles/rails_6_rc_sqlite.gemfile.lock @@ -0,0 +1,278 @@ +GIT + remote: git@github.com:collectiveidea/awesome_nested_set.git + revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123 + specs: + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0) + +PATH + remote: .. + specs: + nocms-blocks (1.2.0) + activeresource (>= 4.0.0, < 6.1) + awesome_nested_set (>= 3.0.0, < 3.2) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + mail (>= 2.7.1) + actionmailer (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.0.rc1) + actionview (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actiontext (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + nokogiri (>= 1.8.5) + actionview (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + globalid (>= 0.3.6) + activemodel (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + marcel (~> 0.3.1) + activesupport (6.0.0.rc1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.1, >= 2.1.4) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) + launchy (2.4.3) + addressable (~> 2.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.0.rc1) + actioncable (= 6.0.0.rc1) + actionmailbox (= 6.0.0.rc1) + actionmailer (= 6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actiontext (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + bundler (>= 1.3.0) + railties (= 6.0.0.rc1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-json (0.2) + json + simplecov + slop (3.6.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.4.1) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.1.6) + +PLATFORMS + ruby + +DEPENDENCIES + actionpack (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + appraisal + awesome_nested_set! + capybara (< 3.16) + capybara-screenshot + carrierwave + database_cleaner + factory_girl + faker + generator_spec + nocms-blocks! + pry-byebug + pry-nav + pry-rails + pry-remote + pry-stack_explorer + rails (= 6.0.0.rc1) + railties (= 6.0.0.rc1) + rspec-rails + simplecov + simplecov-json + sqlite3 + +BUNDLED WITH + 1.17.3 From 4a5451609562d1a37baab393a94f6361ba1bcc4e Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Thu, 30 May 2019 15:27:38 +0200 Subject: [PATCH 10/11] Ruby 2.5 included in Appraisal Rails 6 and Rails 4 demand a different version of Ruby so we had to include code to control ruby version. The code implies that the gemfiles by appraisal will be created and used only when certain ruby versions are being userd. Thus, the Rails 4.0 gemfiles will olny be used, and the tests run, when in a version below ruby 2.4. --- Appraisals | 203 +++++++++++++---- Gemfile | 3 +- Gemfile.lock | 98 --------- gemfiles/rails_4_0_mysql.gemfile | 2 +- gemfiles/rails_4_0_mysql.gemfile.lock | 30 +-- gemfiles/rails_4_0_pgsql.gemfile | 2 +- gemfiles/rails_4_0_pgsql.gemfile.lock | 30 +-- gemfiles/rails_4_0_sqlite.gemfile | 2 +- gemfiles/rails_4_0_sqlite.gemfile.lock | 30 +-- gemfiles/rails_4_1_mysql.gemfile | 2 +- gemfiles/rails_4_1_mysql.gemfile.lock | 30 +-- gemfiles/rails_4_1_pgsql.gemfile | 2 +- gemfiles/rails_4_1_pgsql.gemfile.lock | 30 +-- gemfiles/rails_4_1_sqlite.gemfile | 2 +- gemfiles/rails_4_1_sqlite.gemfile.lock | 30 +-- gemfiles/rails_4_2_mysql.gemfile | 3 +- gemfiles/rails_4_2_mysql.gemfile.lock | 37 ++-- gemfiles/rails_4_2_pgsql.gemfile | 3 +- gemfiles/rails_4_2_pgsql.gemfile.lock | 37 ++-- gemfiles/rails_4_2_sqlite.gemfile | 3 +- gemfiles/rails_4_2_sqlite.gemfile.lock | 37 ++-- gemfiles/rails_5_0_mysql.gemfile | 3 +- gemfiles/rails_5_0_mysql.gemfile.lock | 35 +-- gemfiles/rails_5_0_pgsql.gemfile | 3 +- gemfiles/rails_5_0_pgsql.gemfile.lock | 35 +-- gemfiles/rails_5_0_sqlite.gemfile | 3 +- gemfiles/rails_5_0_sqlite.gemfile.lock | 35 +-- gemfiles/rails_5_1_mysql.gemfile | 3 +- gemfiles/rails_5_1_mysql.gemfile.lock | 35 +-- gemfiles/rails_5_1_pgsql.gemfile | 3 +- gemfiles/rails_5_1_pgsql.gemfile.lock | 35 +-- gemfiles/rails_5_1_sqlite.gemfile | 3 +- gemfiles/rails_5_1_sqlite.gemfile.lock | 35 +-- gemfiles/rails_5_2_mysql.gemfile | 3 +- gemfiles/rails_5_2_mysql.gemfile.lock | 35 +-- gemfiles/rails_5_2_pgsql.gemfile | 3 +- gemfiles/rails_5_2_pgsql.gemfile.lock | 35 +-- gemfiles/rails_5_2_sqlite.gemfile | 3 +- gemfiles/rails_5_2_sqlite.gemfile.lock | 35 +-- gemfiles/rails_6_rc_mysql.gemfile | 32 --- gemfiles/rails_6_rc_mysql.gemfile.lock | 274 ----------------------- gemfiles/rails_6_rc_pgsql.gemfile | 36 --- gemfiles/rails_6_rc_pgsql.gemfile.lock | 278 ------------------------ gemfiles/rails_6_rc_sqlite.gemfile | 36 --- gemfiles/rails_6_rc_sqlite.gemfile.lock | 278 ------------------------ 45 files changed, 496 insertions(+), 1396 deletions(-) delete mode 100644 gemfiles/rails_6_rc_mysql.gemfile delete mode 100644 gemfiles/rails_6_rc_mysql.gemfile.lock delete mode 100644 gemfiles/rails_6_rc_pgsql.gemfile delete mode 100644 gemfiles/rails_6_rc_pgsql.gemfile.lock delete mode 100644 gemfiles/rails_6_rc_sqlite.gemfile delete mode 100644 gemfiles/rails_6_rc_sqlite.gemfile.lock diff --git a/Appraisals b/Appraisals index de999d4..25542fa 100644 --- a/Appraisals +++ b/Appraisals @@ -1,122 +1,231 @@ -appraise "rails-4-0-mysql" do - gem "mysql2", "~> 0.3.10" - gem "rails", "4.0.13" -end +ruby_version = Gem::Version.new(RUBY_VERSION) + +# In Ruby 2.4 some incompatibility wth numeric types was created that affected +# Rails 4.0 and 4.1 making them unable to run +# More info: https://stackoverflow.com/questions/41504106/ruby-2-4-and-rails-4-stack-level-too-deep-systemstackerror +ruby_2_4 = Gem::Version.new('2.4.0') + +# Rails 6 demands ruby over 2.4.4 +ruby_2_4_4 = Gem::Version.new('2.4.4') + +# Globalize latest version (5.3.0) demands ruby over 2.4.6. We need to force +# another version in prior versions +ruby_2_4_6 = Gem::Version.new('2.4.6') + +if ruby_version < ruby_2_4 + + appraise "rails-4-0-mysql" do + gemspec + gem "mysql2", "~> 0.3.10" + gem "rails", "4.0.13" + gem 'rspec-rails', '3.5.0' + end + + appraise "rails-4-1-mysql" do + gemspec + gem "mysql2", "~> 0.3.13" + gem "rails", "4.1.16" + gem 'rspec-rails', '~> 3.5.0.beta' + end -appraise "rails-4-1-mysql" do - gem "mysql2", "~> 0.3.13" - gem "rails", "4.1.16" end appraise "rails-4-2-mysql" do + gemspec gem "mysql2" gem "rails", "4.2.11.1" + gem 'rspec-rails', '~> 3.5.0.beta' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end appraise "rails-5-0-mysql" do + gemspec gem "mysql2" gem 'rails', '5.0.7.2' gem "awesome_nested_set", '~> 3.1.1' + gem 'rspec-rails' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end appraise "rails-5-1-mysql" do + gemspec gem "mysql2" gem 'rails', '5.1.7' + gem 'rspec-rails' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end appraise "rails-5-2-mysql" do + gemspec gem "mysql2" gem 'rails', '5.2.3' + gem 'rspec-rails' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end -appraise "rails-6-rc-mysql" do - gem "mysql2" - gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git' - gem 'actionpack', '6.0.0.rc1' - gem 'rails', '6.0.0.rc1' +if ruby_version > ruby_2_4_4 + appraise "rails-6-rc-mysql" do + gemspec + gem "mysql2" + gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git' + gem 'actionpack', '6.0.0.rc1' + gem 'rails', '6.0.0.rc1' + gem 'rspec-rails' + end end -appraise "rails-4-0-pgsql" do - gem "pg", '~> 0.21.0' - gem "rails", "4.0.13" -end +if ruby_version < ruby_2_4 -appraise "rails-4-1-pgsql" do - gem "pg", '~> 0.21.0' - gem "rails", "4.1.16" + appraise "rails-4-0-pgsql" do + gemspec + gem "pg", '~> 0.21.0' + gem "rails", "4.0.13" + gem 'rspec-rails', '~> 3.5.0.beta' + end + + appraise "rails-4-1-pgsql" do + gemspec + gem "pg", '~> 0.21.0' + gem "rails", "4.1.16" + gem 'rspec-rails', '~> 3.5.0.beta' + end end appraise "rails-4-2-pgsql" do + gemspec gem "pg", '~> 0.21.0' gem "rails", "4.2.11.1" + gem 'rspec-rails', '~> 3.5.0.beta' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end appraise "rails-5-0-pgsql" do + gemspec gem "pg" gem 'rails', '5.0.7.2' gem "awesome_nested_set", '~> 3.1.1' + gem 'rspec-rails' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end appraise "rails-5-1-pgsql" do + gemspec gem "pg" gem 'rails', '5.1.7' + gem 'rspec-rails' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end appraise "rails-5-2-pgsql" do + gemspec gem "pg" gem 'rails', '5.2.3' + gem 'rspec-rails' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end -appraise "rails-6-rc-pgsql" do - gem "pg" - gem 'rails', '6.0.0.rc1' - gem 'actionpack', '6.0.0.rc1' - gem 'activemodel', '6.0.0.rc1' - gem 'activerecord', '6.0.0.rc1' - gem 'activesupport', '6.0.0.rc1' - gem 'railties', '6.0.0.rc1' - gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git' +if ruby_version > ruby_2_4_4 + appraise "rails-6-rc-pgsql" do + gemspec + gem "pg" + gem 'rails', '6.0.0.rc1' + gem 'actionpack', '6.0.0.rc1' + gem 'activemodel', '6.0.0.rc1' + gem 'activerecord', '6.0.0.rc1' + gem 'activesupport', '6.0.0.rc1' + gem 'railties', '6.0.0.rc1' + gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git' + gem 'rspec-rails' + end end -appraise "rails-4-0-sqlite" do - gem "sqlite3", '~> 1.3.13' - gem "rails", "4.0.13" -end +if ruby_version < ruby_2_4 + + appraise "rails-4-0-sqlite" do + gemspec + gem "sqlite3", '~> 1.3.13' + gem "rails", "4.0.13" + gem 'rspec-rails', '~> 3.5.0.beta' + end + + appraise "rails-4-1-sqlite" do + gemspec + gem "sqlite3", '~> 1.3.13' + gem "rails", "4.1.16" + gem 'rspec-rails', '~> 3.5.0.beta' + end -appraise "rails-4-1-sqlite" do - gem "sqlite3", '~> 1.3.13' - gem "rails", "4.1.16" end appraise "rails-4-2-sqlite" do + gemspec gem "sqlite3", '~> 1.3.13' gem "rails", "4.2.11.1" + gem 'rspec-rails', '~> 3.5.0.beta' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end appraise "rails-5-0-sqlite" do + gemspec gem "sqlite3", '~> 1.3.13' gem 'rails', '5.0.7.2' gem "awesome_nested_set", '~> 3.1.1' + gem 'rspec-rails' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end appraise "rails-5-1-sqlite" do + gemspec gem "sqlite3" gem 'rails', '5.1.7' + gem 'rspec-rails' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end end appraise "rails-5-2-sqlite" do + gemspec gem "sqlite3" gem 'rails', '5.2.3' -end - -appraise "rails-6-rc-sqlite" do - gem "sqlite3" - gem 'rails', '6.0.0.rc1' - - gem 'actionpack', '6.0.0.rc1' - gem 'activemodel', '6.0.0.rc1' - gem 'activerecord', '6.0.0.rc1' - gem 'activesupport', '6.0.0.rc1' - gem 'railties', '6.0.0.rc1' - gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git' + gem 'rspec-rails' + if ruby_version < ruby_2_4_6 + gem 'globalize', '~> 5.2.0' + end +end + +if ruby_version > ruby_2_4_4 + appraise "rails-6-rc-sqlite" do + gemspec + gem "sqlite3" + gem 'rails', '6.0.0.rc1' + + gem 'actionpack', '6.0.0.rc1' + gem 'activemodel', '6.0.0.rc1' + gem 'activerecord', '6.0.0.rc1' + gem 'activesupport', '6.0.0.rc1' + gem 'railties', '6.0.0.rc1' + gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git' + gem 'rspec-rails' + end end diff --git a/Gemfile b/Gemfile index 86adc7f..b128472 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" # Declare your gem's dependencies in nocms-blocks.gemspec. # Bundler will treat runtime dependencies like base dependencies, and # development dependencies will be added by default to the :development group. -gemspec +# gemspec # Declare any dependencies that are still in development here instead of in # your gemspec. These might include edge Rails or gems from your path or @@ -22,7 +22,6 @@ group :development, :test do end group :test do - gem 'rspec-rails' gem 'capybara-screenshot' gem 'factory_girl' gem 'capybara', '< 3.16' diff --git a/Gemfile.lock b/Gemfile.lock index f307c8f..2b8ddce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,6 @@ -PATH - remote: . - specs: - nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 6.1) - awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.4) - rails (>= 4.0.0, < 6.1) - GEM remote: https://rubygems.org/ specs: - actioncable (5.2.3) - actionpack (= 5.2.3) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) actionpack (5.2.3) actionview (= 5.2.3) activesupport (= 5.2.3) @@ -33,27 +14,8 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.3) - activesupport (= 5.2.3) - globalid (>= 0.3.6) activemodel (5.2.3) activesupport (= 5.2.3) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) - builder (~> 3.1) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) - arel (>= 9.0) - activeresource (5.1.0) - activemodel (>= 5.0, < 7) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 7) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) - marcel (~> 0.3.1) activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) @@ -65,9 +27,6 @@ GEM bundler rake thor (>= 0.14.0) - arel (9.0.0) - awesome_nested_set (3.1.4) - activerecord (>= 4.0.0, < 5.3) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) @@ -92,7 +51,6 @@ GEM crass (1.0.4) database_cleaner (1.7.0) debug_inspector (0.0.3) - diff-lcs (1.3) docile (1.3.1) erubi (1.8.0) factory_girl (4.9.0) @@ -102,12 +60,6 @@ GEM generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) - request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) json (2.2.0) @@ -116,19 +68,13 @@ GEM loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) - mimemagic (0.3.3) mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - nio4r (2.3.1) nokogiri (1.10.3) mini_portile2 (~> 2.4.0) pry (0.12.2) @@ -151,19 +97,6 @@ GEM rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) - bundler (>= 1.3.0) - railties (= 5.2.3) - sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -177,25 +110,6 @@ GEM thor (>= 0.19.0, < 2.0) rake (12.3.2) regexp_parser (1.5.1) - request_store (1.4.1) - rack (>= 1.4) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -205,20 +119,10 @@ GEM json simplecov slop (3.6.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - websocket-driver (0.7.0) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) xpath (3.2.0) nokogiri (~> 1.8) @@ -234,13 +138,11 @@ DEPENDENCIES factory_girl faker generator_spec - nocms-blocks! pry-byebug pry-nav pry-rails pry-remote pry-stack_explorer - rspec-rails simplecov simplecov-json diff --git a/gemfiles/rails_4_0_mysql.gemfile b/gemfiles/rails_4_0_mysql.gemfile index bbb1918..117aa0b 100644 --- a/gemfiles/rails_4_0_mysql.gemfile +++ b/gemfiles/rails_4_0_mysql.gemfile @@ -4,6 +4,7 @@ source "https://rubygems.org" gem "mysql2", "~> 0.3.10" gem "rails", "4.0.13" +gem "rspec-rails", "3.5.0" group :development, :test do gem "pry-rails" @@ -14,7 +15,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_0_mysql.gemfile.lock b/gemfiles/rails_4_0_mysql.gemfile.lock index e54ebcd..2a250d4 100644 --- a/gemfiles/rails_4_0_mysql.gemfile.lock +++ b/gemfiles/rails_4_0_mysql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -136,23 +136,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.5.0) + rspec-rails (3.5.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -195,9 +195,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.0.13) - rspec-rails + rspec-rails (= 3.5.0) simplecov simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_4_0_pgsql.gemfile b/gemfiles/rails_4_0_pgsql.gemfile index fc1a61a..aa090da 100644 --- a/gemfiles/rails_4_0_pgsql.gemfile +++ b/gemfiles/rails_4_0_pgsql.gemfile @@ -4,6 +4,7 @@ source "https://rubygems.org" gem "pg", "~> 0.21.0" gem "rails", "4.0.13" +gem "rspec-rails", "~> 3.5.0.beta" group :development, :test do gem "pry-rails" @@ -14,7 +15,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_0_pgsql.gemfile.lock b/gemfiles/rails_4_0_pgsql.gemfile.lock index 00c046d..c4e4c99 100644 --- a/gemfiles/rails_4_0_pgsql.gemfile.lock +++ b/gemfiles/rails_4_0_pgsql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -136,23 +136,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -195,9 +195,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.0.13) - rspec-rails + rspec-rails (~> 3.5.0.beta) simplecov simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_4_0_sqlite.gemfile b/gemfiles/rails_4_0_sqlite.gemfile index a5c5d2f..01fbc8e 100644 --- a/gemfiles/rails_4_0_sqlite.gemfile +++ b/gemfiles/rails_4_0_sqlite.gemfile @@ -4,6 +4,7 @@ source "https://rubygems.org" gem "sqlite3", "~> 1.3.13" gem "rails", "4.0.13" +gem "rspec-rails", "~> 3.5.0.beta" group :development, :test do gem "pry-rails" @@ -14,7 +15,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_0_sqlite.gemfile.lock b/gemfiles/rails_4_0_sqlite.gemfile.lock index a52b1a5..016b8a1 100644 --- a/gemfiles/rails_4_0_sqlite.gemfile.lock +++ b/gemfiles/rails_4_0_sqlite.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -135,23 +135,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -194,10 +194,10 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.0.13) - rspec-rails + rspec-rails (~> 3.5.0.beta) simplecov simplecov-json sqlite3 (~> 1.3.13) BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_4_1_mysql.gemfile b/gemfiles/rails_4_1_mysql.gemfile index 1d7e03a..e817c41 100644 --- a/gemfiles/rails_4_1_mysql.gemfile +++ b/gemfiles/rails_4_1_mysql.gemfile @@ -4,6 +4,7 @@ source "https://rubygems.org" gem "mysql2", "~> 0.3.13" gem "rails", "4.1.16" +gem "rspec-rails", "~> 3.5.0.beta" group :development, :test do gem "pry-rails" @@ -14,7 +15,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_1_mysql.gemfile.lock b/gemfiles/rails_4_1_mysql.gemfile.lock index a6006c4..dabb53e 100644 --- a/gemfiles/rails_4_1_mysql.gemfile.lock +++ b/gemfiles/rails_4_1_mysql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -139,23 +139,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -199,9 +199,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.1.16) - rspec-rails + rspec-rails (~> 3.5.0.beta) simplecov simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_4_1_pgsql.gemfile b/gemfiles/rails_4_1_pgsql.gemfile index ed13cfc..6b3a05b 100644 --- a/gemfiles/rails_4_1_pgsql.gemfile +++ b/gemfiles/rails_4_1_pgsql.gemfile @@ -4,6 +4,7 @@ source "https://rubygems.org" gem "pg", "~> 0.21.0" gem "rails", "4.1.16" +gem "rspec-rails", "~> 3.5.0.beta" group :development, :test do gem "pry-rails" @@ -14,7 +15,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_1_pgsql.gemfile.lock b/gemfiles/rails_4_1_pgsql.gemfile.lock index 645fb0a..efbb6cc 100644 --- a/gemfiles/rails_4_1_pgsql.gemfile.lock +++ b/gemfiles/rails_4_1_pgsql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -139,23 +139,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -199,9 +199,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.1.16) - rspec-rails + rspec-rails (~> 3.5.0.beta) simplecov simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_4_1_sqlite.gemfile b/gemfiles/rails_4_1_sqlite.gemfile index a726a3b..6a285e1 100644 --- a/gemfiles/rails_4_1_sqlite.gemfile +++ b/gemfiles/rails_4_1_sqlite.gemfile @@ -4,6 +4,7 @@ source "https://rubygems.org" gem "sqlite3", "~> 1.3.13" gem "rails", "4.1.16" +gem "rspec-rails", "~> 3.5.0.beta" group :development, :test do gem "pry-rails" @@ -14,7 +15,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_1_sqlite.gemfile.lock b/gemfiles/rails_4_1_sqlite.gemfile.lock index 75e4f8d..283fbcd 100644 --- a/gemfiles/rails_4_1_sqlite.gemfile.lock +++ b/gemfiles/rails_4_1_sqlite.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -138,23 +138,23 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -198,10 +198,10 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.1.16) - rspec-rails + rspec-rails (~> 3.5.0.beta) simplecov simplecov-json sqlite3 (~> 1.3.13) BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_4_2_mysql.gemfile b/gemfiles/rails_4_2_mysql.gemfile index 180b986..d584e24 100644 --- a/gemfiles/rails_4_2_mysql.gemfile +++ b/gemfiles/rails_4_2_mysql.gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "mysql2" gem "rails", "4.2.11.1" +gem "rspec-rails", "~> 3.5.0.beta" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -14,7 +16,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_2_mysql.gemfile.lock b/gemfiles/rails_4_2_mysql.gemfile.lock index dcd604e..4fb78f4 100644 --- a/gemfiles/rails_4_2_mysql.gemfile.lock +++ b/gemfiles/rails_4_2_mysql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -93,9 +93,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -167,23 +167,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -219,6 +219,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) mysql2 nocms-blocks! pry-byebug @@ -227,9 +228,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.2.11.1) - rspec-rails + rspec-rails (~> 3.5.0.beta) simplecov simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_4_2_pgsql.gemfile b/gemfiles/rails_4_2_pgsql.gemfile index bc6878f..fec6d19 100644 --- a/gemfiles/rails_4_2_pgsql.gemfile +++ b/gemfiles/rails_4_2_pgsql.gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "pg", "~> 0.21.0" gem "rails", "4.2.11.1" +gem "rspec-rails", "~> 3.5.0.beta" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -14,7 +16,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_2_pgsql.gemfile.lock b/gemfiles/rails_4_2_pgsql.gemfile.lock index f856867..515d47c 100644 --- a/gemfiles/rails_4_2_pgsql.gemfile.lock +++ b/gemfiles/rails_4_2_pgsql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -93,9 +93,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -167,23 +167,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -219,6 +219,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) nocms-blocks! pg (~> 0.21.0) pry-byebug @@ -227,9 +228,9 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.2.11.1) - rspec-rails + rspec-rails (~> 3.5.0.beta) simplecov simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_4_2_sqlite.gemfile b/gemfiles/rails_4_2_sqlite.gemfile index f0c2618..e3a5c2b 100644 --- a/gemfiles/rails_4_2_sqlite.gemfile +++ b/gemfiles/rails_4_2_sqlite.gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "sqlite3", "~> 1.3.13" gem "rails", "4.2.11.1" +gem "rspec-rails", "~> 3.5.0.beta" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -14,7 +16,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_4_2_sqlite.gemfile.lock b/gemfiles/rails_4_2_sqlite.gemfile.lock index 0c6eb86..a40751b 100644 --- a/gemfiles/rails_4_2_sqlite.gemfile.lock +++ b/gemfiles/rails_4_2_sqlite.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -93,9 +93,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -166,23 +166,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -219,6 +219,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) nocms-blocks! pry-byebug pry-nav @@ -226,10 +227,10 @@ DEPENDENCIES pry-remote pry-stack_explorer rails (= 4.2.11.1) - rspec-rails + rspec-rails (~> 3.5.0.beta) simplecov simplecov-json sqlite3 (~> 1.3.13) BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_5_0_mysql.gemfile b/gemfiles/rails_5_0_mysql.gemfile index 7f53d51..13ae467 100644 --- a/gemfiles/rails_5_0_mysql.gemfile +++ b/gemfiles/rails_5_0_mysql.gemfile @@ -5,6 +5,8 @@ source "https://rubygems.org" gem "mysql2" gem "rails", "5.0.7.2" gem "awesome_nested_set", "~> 3.1.1" +gem "rspec-rails" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -15,7 +17,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_0_mysql.gemfile.lock b/gemfiles/rails_5_0_mysql.gemfile.lock index 0491982..beeef6d 100644 --- a/gemfiles/rails_5_0_mysql.gemfile.lock +++ b/gemfiles/rails_5_0_mysql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -172,23 +172,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -228,6 +228,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) mysql2 nocms-blocks! pry-byebug @@ -241,4 +242,4 @@ DEPENDENCIES simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_5_0_pgsql.gemfile b/gemfiles/rails_5_0_pgsql.gemfile index ec40370..74c8a40 100644 --- a/gemfiles/rails_5_0_pgsql.gemfile +++ b/gemfiles/rails_5_0_pgsql.gemfile @@ -5,6 +5,8 @@ source "https://rubygems.org" gem "pg" gem "rails", "5.0.7.2" gem "awesome_nested_set", "~> 3.1.1" +gem "rspec-rails" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -15,7 +17,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_0_pgsql.gemfile.lock b/gemfiles/rails_5_0_pgsql.gemfile.lock index 68bea2e..7ed257e 100644 --- a/gemfiles/rails_5_0_pgsql.gemfile.lock +++ b/gemfiles/rails_5_0_pgsql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -172,23 +172,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -228,6 +228,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) nocms-blocks! pg pry-byebug @@ -241,4 +242,4 @@ DEPENDENCIES simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_5_0_sqlite.gemfile b/gemfiles/rails_5_0_sqlite.gemfile index 1c826e5..5c7485a 100644 --- a/gemfiles/rails_5_0_sqlite.gemfile +++ b/gemfiles/rails_5_0_sqlite.gemfile @@ -5,6 +5,8 @@ source "https://rubygems.org" gem "sqlite3", "~> 1.3.13" gem "rails", "5.0.7.2" gem "awesome_nested_set", "~> 3.1.1" +gem "rspec-rails" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -15,7 +17,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_0_sqlite.gemfile.lock b/gemfiles/rails_5_0_sqlite.gemfile.lock index baacfb3..9749c3f 100644 --- a/gemfiles/rails_5_0_sqlite.gemfile.lock +++ b/gemfiles/rails_5_0_sqlite.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -171,23 +171,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -228,6 +228,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) nocms-blocks! pry-byebug pry-nav @@ -241,4 +242,4 @@ DEPENDENCIES sqlite3 (~> 1.3.13) BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_5_1_mysql.gemfile b/gemfiles/rails_5_1_mysql.gemfile index eedc847..d1702fb 100644 --- a/gemfiles/rails_5_1_mysql.gemfile +++ b/gemfiles/rails_5_1_mysql.gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "mysql2" gem "rails", "5.1.7" +gem "rspec-rails" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -14,7 +16,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_1_mysql.gemfile.lock b/gemfiles/rails_5_1_mysql.gemfile.lock index af82025..e80ee0c 100644 --- a/gemfiles/rails_5_1_mysql.gemfile.lock +++ b/gemfiles/rails_5_1_mysql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -172,23 +172,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -227,6 +227,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) mysql2 nocms-blocks! pry-byebug @@ -240,4 +241,4 @@ DEPENDENCIES simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_5_1_pgsql.gemfile b/gemfiles/rails_5_1_pgsql.gemfile index 11058e4..5445e54 100644 --- a/gemfiles/rails_5_1_pgsql.gemfile +++ b/gemfiles/rails_5_1_pgsql.gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "pg" gem "rails", "5.1.7" +gem "rspec-rails" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -14,7 +16,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_1_pgsql.gemfile.lock b/gemfiles/rails_5_1_pgsql.gemfile.lock index 89f3b5f..f1e9801 100644 --- a/gemfiles/rails_5_1_pgsql.gemfile.lock +++ b/gemfiles/rails_5_1_pgsql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -172,23 +172,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -227,6 +227,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) nocms-blocks! pg pry-byebug @@ -240,4 +241,4 @@ DEPENDENCIES simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_5_1_sqlite.gemfile b/gemfiles/rails_5_1_sqlite.gemfile index a05962d..7b6f1fc 100644 --- a/gemfiles/rails_5_1_sqlite.gemfile +++ b/gemfiles/rails_5_1_sqlite.gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "sqlite3" gem "rails", "5.1.7" +gem "rspec-rails" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -14,7 +16,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_1_sqlite.gemfile.lock b/gemfiles/rails_5_1_sqlite.gemfile.lock index ca86e20..4e91867 100644 --- a/gemfiles/rails_5_1_sqlite.gemfile.lock +++ b/gemfiles/rails_5_1_sqlite.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -100,9 +100,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -171,23 +171,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -227,6 +227,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) nocms-blocks! pry-byebug pry-nav @@ -240,4 +241,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_5_2_mysql.gemfile b/gemfiles/rails_5_2_mysql.gemfile index 19472d2..d54e757 100644 --- a/gemfiles/rails_5_2_mysql.gemfile +++ b/gemfiles/rails_5_2_mysql.gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "mysql2" gem "rails", "5.2.3" +gem "rspec-rails" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -14,7 +16,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_2_mysql.gemfile.lock b/gemfiles/rails_5_2_mysql.gemfile.lock index a805d62..294a4d1 100644 --- a/gemfiles/rails_5_2_mysql.gemfile.lock +++ b/gemfiles/rails_5_2_mysql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -104,9 +104,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -180,23 +180,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -235,6 +235,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) mysql2 nocms-blocks! pry-byebug @@ -248,4 +249,4 @@ DEPENDENCIES simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_5_2_pgsql.gemfile b/gemfiles/rails_5_2_pgsql.gemfile index 857d44e..5e1b126 100644 --- a/gemfiles/rails_5_2_pgsql.gemfile +++ b/gemfiles/rails_5_2_pgsql.gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "pg" gem "rails", "5.2.3" +gem "rspec-rails" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -14,7 +16,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_2_pgsql.gemfile.lock b/gemfiles/rails_5_2_pgsql.gemfile.lock index fd9c251..341ba7e 100644 --- a/gemfiles/rails_5_2_pgsql.gemfile.lock +++ b/gemfiles/rails_5_2_pgsql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -104,9 +104,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -180,23 +180,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -235,6 +235,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) nocms-blocks! pg pry-byebug @@ -248,4 +249,4 @@ DEPENDENCIES simplecov-json BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_5_2_sqlite.gemfile b/gemfiles/rails_5_2_sqlite.gemfile index a50500f..928e361 100644 --- a/gemfiles/rails_5_2_sqlite.gemfile +++ b/gemfiles/rails_5_2_sqlite.gemfile @@ -4,6 +4,8 @@ source "https://rubygems.org" gem "sqlite3" gem "rails", "5.2.3" +gem "rspec-rails" +gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" @@ -14,7 +16,6 @@ group :development, :test do end group :test do - gem "rspec-rails" gem "capybara-screenshot" gem "factory_girl" gem "capybara", "< 3.16" diff --git a/gemfiles/rails_5_2_sqlite.gemfile.lock b/gemfiles/rails_5_2_sqlite.gemfile.lock index 2e79736..88fe287 100644 --- a/gemfiles/rails_5_2_sqlite.gemfile.lock +++ b/gemfiles/rails_5_2_sqlite.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: .. + remote: ../ specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -104,9 +104,9 @@ GEM railties (>= 3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) request_store (~> 1.0) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -179,23 +179,23 @@ GEM regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -235,6 +235,7 @@ DEPENDENCIES factory_girl faker generator_spec + globalize (~> 5.2.0) nocms-blocks! pry-byebug pry-nav @@ -248,4 +249,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 1.17.3 + 1.13.6 diff --git a/gemfiles/rails_6_rc_mysql.gemfile b/gemfiles/rails_6_rc_mysql.gemfile deleted file mode 100644 index 851758b..0000000 --- a/gemfiles/rails_6_rc_mysql.gemfile +++ /dev/null @@ -1,32 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "mysql2" -gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git" -gem "actionpack", "6.0.0.rc1" -gem "rails", "6.0.0.rc1" - -group :development, :test do - gem "pry-rails" - gem "pry-byebug" - gem "pry-nav" - gem "pry-remote" - gem "pry-stack_explorer" -end - -group :test do - gem "rspec-rails" - gem "capybara-screenshot" - gem "factory_girl" - gem "capybara", "< 3.16" - gem "database_cleaner" - gem "faker" - gem "carrierwave" - gem "appraisal" - gem "simplecov" - gem "simplecov-json" - gem "generator_spec" -end - -gemspec path: "../" diff --git a/gemfiles/rails_6_rc_mysql.gemfile.lock b/gemfiles/rails_6_rc_mysql.gemfile.lock deleted file mode 100644 index 7d57fe1..0000000 --- a/gemfiles/rails_6_rc_mysql.gemfile.lock +++ /dev/null @@ -1,274 +0,0 @@ -GIT - remote: git@github.com:collectiveidea/awesome_nested_set.git - revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123 - specs: - awesome_nested_set (3.1.4) - activerecord (>= 4.0.0) - -PATH - remote: .. - specs: - nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 6.1) - awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.4) - rails (>= 4.0.0, < 6.1) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activestorage (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - mail (>= 2.7.1) - actionmailer (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - actionview (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.0.0.rc1) - actionview (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - rack (~> 2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actiontext (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activestorage (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - nokogiri (>= 1.8.5) - actionview (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - globalid (>= 0.3.6) - activemodel (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) - builder (~> 3.1) - activerecord (6.0.0.rc1) - activemodel (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - activeresource (5.1.0) - activemodel (>= 5.0, < 7) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 7) - activestorage (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - marcel (~> 0.3.1) - activesupport (6.0.0.rc1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.1, >= 2.1.4) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - builder (3.2.3) - byebug (11.0.1) - capybara (3.15.1) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (~> 1.2) - xpath (~> 3.2) - capybara-screenshot (1.0.22) - capybara (>= 1.0, < 4) - launchy - carrierwave (1.3.1) - activemodel (>= 4.0.0) - activesupport (>= 4.0.0) - mime-types (>= 1.16) - coderay (1.1.2) - concurrent-ruby (1.1.5) - crass (1.0.4) - database_cleaner (1.7.0) - debug_inspector (0.0.3) - diff-lcs (1.3) - docile (1.3.1) - erubi (1.8.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - faker (1.9.3) - i18n (>= 0.7) - generator_spec (0.9.4) - activesupport (>= 3.0.0) - railties (>= 3.0.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) - request_store (~> 1.0) - i18n (1.6.0) - concurrent-ruby (~> 1.0) - json (2.2.0) - launchy (2.4.3) - addressable (~> 2.3) - loofah (2.2.3) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - method_source (0.9.2) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) - mimemagic (0.3.3) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) - mysql2 (0.5.2) - nio4r (2.3.1) - nokogiri (1.10.3) - mini_portile2 (~> 2.4.0) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.7.0) - byebug (~> 11.0) - pry (~> 0.10) - pry-nav (0.3.0) - pry (>= 0.9.10, < 0.13.0) - pry-rails (0.3.9) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - pry-stack_explorer (0.4.9.3) - binding_of_caller (>= 0.7) - pry (>= 0.9.11) - public_suffix (3.1.0) - rack (2.0.7) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.0.0.rc1) - actioncable (= 6.0.0.rc1) - actionmailbox (= 6.0.0.rc1) - actionmailer (= 6.0.0.rc1) - actionpack (= 6.0.0.rc1) - actiontext (= 6.0.0.rc1) - actionview (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - activemodel (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activestorage (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - bundler (>= 1.3.0) - railties (= 6.0.0.rc1) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rake (12.3.2) - regexp_parser (1.5.1) - request_store (1.4.1) - rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - simplecov-json (0.2) - json - simplecov - slop (3.6.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - thor (0.20.3) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - websocket-driver (0.7.0) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - xpath (3.2.0) - nokogiri (~> 1.8) - zeitwerk (2.1.6) - -PLATFORMS - ruby - -DEPENDENCIES - actionpack (= 6.0.0.rc1) - appraisal - awesome_nested_set! - capybara (< 3.16) - capybara-screenshot - carrierwave - database_cleaner - factory_girl - faker - generator_spec - mysql2 - nocms-blocks! - pry-byebug - pry-nav - pry-rails - pry-remote - pry-stack_explorer - rails (= 6.0.0.rc1) - rspec-rails - simplecov - simplecov-json - -BUNDLED WITH - 1.17.3 diff --git a/gemfiles/rails_6_rc_pgsql.gemfile b/gemfiles/rails_6_rc_pgsql.gemfile deleted file mode 100644 index 4be8a8e..0000000 --- a/gemfiles/rails_6_rc_pgsql.gemfile +++ /dev/null @@ -1,36 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "pg" -gem "rails", "6.0.0.rc1" -gem "actionpack", "6.0.0.rc1" -gem "activemodel", "6.0.0.rc1" -gem "activerecord", "6.0.0.rc1" -gem "activesupport", "6.0.0.rc1" -gem "railties", "6.0.0.rc1" -gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git" - -group :development, :test do - gem "pry-rails" - gem "pry-byebug" - gem "pry-nav" - gem "pry-remote" - gem "pry-stack_explorer" -end - -group :test do - gem "rspec-rails" - gem "capybara-screenshot" - gem "factory_girl" - gem "capybara", "< 3.16" - gem "database_cleaner" - gem "faker" - gem "carrierwave" - gem "appraisal" - gem "simplecov" - gem "simplecov-json" - gem "generator_spec" -end - -gemspec path: "../" diff --git a/gemfiles/rails_6_rc_pgsql.gemfile.lock b/gemfiles/rails_6_rc_pgsql.gemfile.lock deleted file mode 100644 index 84d7eb7..0000000 --- a/gemfiles/rails_6_rc_pgsql.gemfile.lock +++ /dev/null @@ -1,278 +0,0 @@ -GIT - remote: git@github.com:collectiveidea/awesome_nested_set.git - revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123 - specs: - awesome_nested_set (3.1.4) - activerecord (>= 4.0.0) - -PATH - remote: .. - specs: - nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 6.1) - awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.4) - rails (>= 4.0.0, < 6.1) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activestorage (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - mail (>= 2.7.1) - actionmailer (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - actionview (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.0.0.rc1) - actionview (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - rack (~> 2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actiontext (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activestorage (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - nokogiri (>= 1.8.5) - actionview (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - globalid (>= 0.3.6) - activemodel (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) - builder (~> 3.1) - activerecord (6.0.0.rc1) - activemodel (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - activeresource (5.1.0) - activemodel (>= 5.0, < 7) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 7) - activestorage (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - marcel (~> 0.3.1) - activesupport (6.0.0.rc1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.1, >= 2.1.4) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - builder (3.2.3) - byebug (11.0.1) - capybara (3.15.1) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (~> 1.2) - xpath (~> 3.2) - capybara-screenshot (1.0.22) - capybara (>= 1.0, < 4) - launchy - carrierwave (1.3.1) - activemodel (>= 4.0.0) - activesupport (>= 4.0.0) - mime-types (>= 1.16) - coderay (1.1.2) - concurrent-ruby (1.1.5) - crass (1.0.4) - database_cleaner (1.7.0) - debug_inspector (0.0.3) - diff-lcs (1.3) - docile (1.3.1) - erubi (1.8.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - faker (1.9.3) - i18n (>= 0.7) - generator_spec (0.9.4) - activesupport (>= 3.0.0) - railties (>= 3.0.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) - request_store (~> 1.0) - i18n (1.6.0) - concurrent-ruby (~> 1.0) - json (2.2.0) - launchy (2.4.3) - addressable (~> 2.3) - loofah (2.2.3) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - method_source (0.9.2) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) - mimemagic (0.3.3) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) - nio4r (2.3.1) - nokogiri (1.10.3) - mini_portile2 (~> 2.4.0) - pg (1.1.4) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.7.0) - byebug (~> 11.0) - pry (~> 0.10) - pry-nav (0.3.0) - pry (>= 0.9.10, < 0.13.0) - pry-rails (0.3.9) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - pry-stack_explorer (0.4.9.3) - binding_of_caller (>= 0.7) - pry (>= 0.9.11) - public_suffix (3.1.0) - rack (2.0.7) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.0.0.rc1) - actioncable (= 6.0.0.rc1) - actionmailbox (= 6.0.0.rc1) - actionmailer (= 6.0.0.rc1) - actionpack (= 6.0.0.rc1) - actiontext (= 6.0.0.rc1) - actionview (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - activemodel (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activestorage (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - bundler (>= 1.3.0) - railties (= 6.0.0.rc1) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rake (12.3.2) - regexp_parser (1.5.1) - request_store (1.4.1) - rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - simplecov-json (0.2) - json - simplecov - slop (3.6.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - thor (0.20.3) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - websocket-driver (0.7.0) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - xpath (3.2.0) - nokogiri (~> 1.8) - zeitwerk (2.1.6) - -PLATFORMS - ruby - -DEPENDENCIES - actionpack (= 6.0.0.rc1) - activemodel (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - appraisal - awesome_nested_set! - capybara (< 3.16) - capybara-screenshot - carrierwave - database_cleaner - factory_girl - faker - generator_spec - nocms-blocks! - pg - pry-byebug - pry-nav - pry-rails - pry-remote - pry-stack_explorer - rails (= 6.0.0.rc1) - railties (= 6.0.0.rc1) - rspec-rails - simplecov - simplecov-json - -BUNDLED WITH - 1.17.3 diff --git a/gemfiles/rails_6_rc_sqlite.gemfile b/gemfiles/rails_6_rc_sqlite.gemfile deleted file mode 100644 index e7e59c1..0000000 --- a/gemfiles/rails_6_rc_sqlite.gemfile +++ /dev/null @@ -1,36 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "sqlite3" -gem "rails", "6.0.0.rc1" -gem "actionpack", "6.0.0.rc1" -gem "activemodel", "6.0.0.rc1" -gem "activerecord", "6.0.0.rc1" -gem "activesupport", "6.0.0.rc1" -gem "railties", "6.0.0.rc1" -gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git" - -group :development, :test do - gem "pry-rails" - gem "pry-byebug" - gem "pry-nav" - gem "pry-remote" - gem "pry-stack_explorer" -end - -group :test do - gem "rspec-rails" - gem "capybara-screenshot" - gem "factory_girl" - gem "capybara", "< 3.16" - gem "database_cleaner" - gem "faker" - gem "carrierwave" - gem "appraisal" - gem "simplecov" - gem "simplecov-json" - gem "generator_spec" -end - -gemspec path: "../" diff --git a/gemfiles/rails_6_rc_sqlite.gemfile.lock b/gemfiles/rails_6_rc_sqlite.gemfile.lock deleted file mode 100644 index 8cdc63a..0000000 --- a/gemfiles/rails_6_rc_sqlite.gemfile.lock +++ /dev/null @@ -1,278 +0,0 @@ -GIT - remote: git@github.com:collectiveidea/awesome_nested_set.git - revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123 - specs: - awesome_nested_set (3.1.4) - activerecord (>= 4.0.0) - -PATH - remote: .. - specs: - nocms-blocks (1.2.0) - activeresource (>= 4.0.0, < 6.1) - awesome_nested_set (>= 3.0.0, < 3.2) - globalize (>= 4.0.0, < 5.4) - rails (>= 4.0.0, < 6.1) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activestorage (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - mail (>= 2.7.1) - actionmailer (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - actionview (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.0.0.rc1) - actionview (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - rack (~> 2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actiontext (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activestorage (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - nokogiri (>= 1.8.5) - actionview (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - globalid (>= 0.3.6) - activemodel (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) - builder (~> 3.1) - activerecord (6.0.0.rc1) - activemodel (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - activeresource (5.1.0) - activemodel (>= 5.0, < 7) - activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 7) - activestorage (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - marcel (~> 0.3.1) - activesupport (6.0.0.rc1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.1, >= 2.1.4) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - builder (3.2.3) - byebug (11.0.1) - capybara (3.15.1) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (~> 1.2) - xpath (~> 3.2) - capybara-screenshot (1.0.22) - capybara (>= 1.0, < 4) - launchy - carrierwave (1.3.1) - activemodel (>= 4.0.0) - activesupport (>= 4.0.0) - mime-types (>= 1.16) - coderay (1.1.2) - concurrent-ruby (1.1.5) - crass (1.0.4) - database_cleaner (1.7.0) - debug_inspector (0.0.3) - diff-lcs (1.3) - docile (1.3.1) - erubi (1.8.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - faker (1.9.3) - i18n (>= 0.7) - generator_spec (0.9.4) - activesupport (>= 3.0.0) - railties (>= 3.0.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - globalize (5.3.0) - activemodel (>= 4.2, < 6.1) - activerecord (>= 4.2, < 6.1) - request_store (~> 1.0) - i18n (1.6.0) - concurrent-ruby (~> 1.0) - json (2.2.0) - launchy (2.4.3) - addressable (~> 2.3) - loofah (2.2.3) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - method_source (0.9.2) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) - mimemagic (0.3.3) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) - nio4r (2.3.1) - nokogiri (1.10.3) - mini_portile2 (~> 2.4.0) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.7.0) - byebug (~> 11.0) - pry (~> 0.10) - pry-nav (0.3.0) - pry (>= 0.9.10, < 0.13.0) - pry-rails (0.3.9) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - pry-stack_explorer (0.4.9.3) - binding_of_caller (>= 0.7) - pry (>= 0.9.11) - public_suffix (3.1.0) - rack (2.0.7) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.0.0.rc1) - actioncable (= 6.0.0.rc1) - actionmailbox (= 6.0.0.rc1) - actionmailer (= 6.0.0.rc1) - actionpack (= 6.0.0.rc1) - actiontext (= 6.0.0.rc1) - actionview (= 6.0.0.rc1) - activejob (= 6.0.0.rc1) - activemodel (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activestorage (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - bundler (>= 1.3.0) - railties (= 6.0.0.rc1) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rake (12.3.2) - regexp_parser (1.5.1) - request_store (1.4.1) - rack (>= 1.4) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - simplecov-json (0.2) - json - simplecov - slop (3.6.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.4.1) - thor (0.20.3) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - websocket-driver (0.7.0) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - xpath (3.2.0) - nokogiri (~> 1.8) - zeitwerk (2.1.6) - -PLATFORMS - ruby - -DEPENDENCIES - actionpack (= 6.0.0.rc1) - activemodel (= 6.0.0.rc1) - activerecord (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - appraisal - awesome_nested_set! - capybara (< 3.16) - capybara-screenshot - carrierwave - database_cleaner - factory_girl - faker - generator_spec - nocms-blocks! - pry-byebug - pry-nav - pry-rails - pry-remote - pry-stack_explorer - rails (= 6.0.0.rc1) - railties (= 6.0.0.rc1) - rspec-rails - simplecov - simplecov-json - sqlite3 - -BUNDLED WITH - 1.17.3 From 7ea5051a90b5b6dd708e779f3f52f4d805dfaec8 Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Thu, 30 May 2019 15:36:27 +0200 Subject: [PATCH 11/11] Tests green on Rails 6 and Ruby 2.5 gemfiles generated and specs run and passed in Rails 6 --- gemfiles/rails_4_2_mysql.gemfile | 1 - gemfiles/rails_4_2_pgsql.gemfile | 1 - gemfiles/rails_4_2_sqlite.gemfile | 1 - gemfiles/rails_5_0_mysql.gemfile | 1 - gemfiles/rails_5_0_mysql.gemfile.lock | 5 +- gemfiles/rails_5_0_pgsql.gemfile | 1 - gemfiles/rails_5_0_sqlite.gemfile | 1 - gemfiles/rails_5_1_mysql.gemfile | 1 - gemfiles/rails_5_1_pgsql.gemfile | 1 - gemfiles/rails_5_1_sqlite.gemfile | 1 - gemfiles/rails_5_2_mysql.gemfile | 1 - gemfiles/rails_5_2_pgsql.gemfile | 1 - gemfiles/rails_5_2_sqlite.gemfile | 1 - gemfiles/rails_6_rc_mysql.gemfile | 32 +++ gemfiles/rails_6_rc_mysql.gemfile.lock | 274 +++++++++++++++++++++++ gemfiles/rails_6_rc_pgsql.gemfile | 36 +++ gemfiles/rails_6_rc_pgsql.gemfile.lock | 278 ++++++++++++++++++++++++ gemfiles/rails_6_rc_sqlite.gemfile | 36 +++ gemfiles/rails_6_rc_sqlite.gemfile.lock | 278 ++++++++++++++++++++++++ 19 files changed, 936 insertions(+), 15 deletions(-) create mode 100644 gemfiles/rails_6_rc_mysql.gemfile create mode 100644 gemfiles/rails_6_rc_mysql.gemfile.lock create mode 100644 gemfiles/rails_6_rc_pgsql.gemfile create mode 100644 gemfiles/rails_6_rc_pgsql.gemfile.lock create mode 100644 gemfiles/rails_6_rc_sqlite.gemfile create mode 100644 gemfiles/rails_6_rc_sqlite.gemfile.lock diff --git a/gemfiles/rails_4_2_mysql.gemfile b/gemfiles/rails_4_2_mysql.gemfile index d584e24..f3afb90 100644 --- a/gemfiles/rails_4_2_mysql.gemfile +++ b/gemfiles/rails_4_2_mysql.gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "mysql2" gem "rails", "4.2.11.1" gem "rspec-rails", "~> 3.5.0.beta" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_4_2_pgsql.gemfile b/gemfiles/rails_4_2_pgsql.gemfile index fec6d19..19f81a4 100644 --- a/gemfiles/rails_4_2_pgsql.gemfile +++ b/gemfiles/rails_4_2_pgsql.gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "pg", "~> 0.21.0" gem "rails", "4.2.11.1" gem "rspec-rails", "~> 3.5.0.beta" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_4_2_sqlite.gemfile b/gemfiles/rails_4_2_sqlite.gemfile index e3a5c2b..3276ad5 100644 --- a/gemfiles/rails_4_2_sqlite.gemfile +++ b/gemfiles/rails_4_2_sqlite.gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "sqlite3", "~> 1.3.13" gem "rails", "4.2.11.1" gem "rspec-rails", "~> 3.5.0.beta" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_5_0_mysql.gemfile b/gemfiles/rails_5_0_mysql.gemfile index 13ae467..d0c4e3c 100644 --- a/gemfiles/rails_5_0_mysql.gemfile +++ b/gemfiles/rails_5_0_mysql.gemfile @@ -6,7 +6,6 @@ gem "mysql2" gem "rails", "5.0.7.2" gem "awesome_nested_set", "~> 3.1.1" gem "rspec-rails" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_5_0_mysql.gemfile.lock b/gemfiles/rails_5_0_mysql.gemfile.lock index beeef6d..33d1068 100644 --- a/gemfiles/rails_5_0_mysql.gemfile.lock +++ b/gemfiles/rails_5_0_mysql.gemfile.lock @@ -1,5 +1,5 @@ PATH - remote: ../ + remote: .. specs: nocms-blocks (1.2.0) activeresource (>= 4.0.0, < 6.1) @@ -228,7 +228,6 @@ DEPENDENCIES factory_girl faker generator_spec - globalize (~> 5.2.0) mysql2 nocms-blocks! pry-byebug @@ -242,4 +241,4 @@ DEPENDENCIES simplecov-json BUNDLED WITH - 1.13.6 + 1.17.3 diff --git a/gemfiles/rails_5_0_pgsql.gemfile b/gemfiles/rails_5_0_pgsql.gemfile index 74c8a40..cc61029 100644 --- a/gemfiles/rails_5_0_pgsql.gemfile +++ b/gemfiles/rails_5_0_pgsql.gemfile @@ -6,7 +6,6 @@ gem "pg" gem "rails", "5.0.7.2" gem "awesome_nested_set", "~> 3.1.1" gem "rspec-rails" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_5_0_sqlite.gemfile b/gemfiles/rails_5_0_sqlite.gemfile index 5c7485a..b651bb5 100644 --- a/gemfiles/rails_5_0_sqlite.gemfile +++ b/gemfiles/rails_5_0_sqlite.gemfile @@ -6,7 +6,6 @@ gem "sqlite3", "~> 1.3.13" gem "rails", "5.0.7.2" gem "awesome_nested_set", "~> 3.1.1" gem "rspec-rails" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_5_1_mysql.gemfile b/gemfiles/rails_5_1_mysql.gemfile index d1702fb..7c932d5 100644 --- a/gemfiles/rails_5_1_mysql.gemfile +++ b/gemfiles/rails_5_1_mysql.gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "mysql2" gem "rails", "5.1.7" gem "rspec-rails" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_5_1_pgsql.gemfile b/gemfiles/rails_5_1_pgsql.gemfile index 5445e54..1ea8ba9 100644 --- a/gemfiles/rails_5_1_pgsql.gemfile +++ b/gemfiles/rails_5_1_pgsql.gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "pg" gem "rails", "5.1.7" gem "rspec-rails" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_5_1_sqlite.gemfile b/gemfiles/rails_5_1_sqlite.gemfile index 7b6f1fc..d25cec5 100644 --- a/gemfiles/rails_5_1_sqlite.gemfile +++ b/gemfiles/rails_5_1_sqlite.gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "sqlite3" gem "rails", "5.1.7" gem "rspec-rails" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_5_2_mysql.gemfile b/gemfiles/rails_5_2_mysql.gemfile index d54e757..d03a6c1 100644 --- a/gemfiles/rails_5_2_mysql.gemfile +++ b/gemfiles/rails_5_2_mysql.gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "mysql2" gem "rails", "5.2.3" gem "rspec-rails" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_5_2_pgsql.gemfile b/gemfiles/rails_5_2_pgsql.gemfile index 5e1b126..f10d5cd 100644 --- a/gemfiles/rails_5_2_pgsql.gemfile +++ b/gemfiles/rails_5_2_pgsql.gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "pg" gem "rails", "5.2.3" gem "rspec-rails" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_5_2_sqlite.gemfile b/gemfiles/rails_5_2_sqlite.gemfile index 928e361..aa71d75 100644 --- a/gemfiles/rails_5_2_sqlite.gemfile +++ b/gemfiles/rails_5_2_sqlite.gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "sqlite3" gem "rails", "5.2.3" gem "rspec-rails" -gem "globalize", "~> 5.2.0" group :development, :test do gem "pry-rails" diff --git a/gemfiles/rails_6_rc_mysql.gemfile b/gemfiles/rails_6_rc_mysql.gemfile new file mode 100644 index 0000000..2a7efa0 --- /dev/null +++ b/gemfiles/rails_6_rc_mysql.gemfile @@ -0,0 +1,32 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "mysql2" +gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git" +gem "actionpack", "6.0.0.rc1" +gem "rails", "6.0.0.rc1" +gem "rspec-rails" + +group :development, :test do + gem "pry-rails" + gem "pry-byebug" + gem "pry-nav" + gem "pry-remote" + gem "pry-stack_explorer" +end + +group :test do + gem "capybara-screenshot" + gem "factory_girl" + gem "capybara", "< 3.16" + gem "database_cleaner" + gem "faker" + gem "carrierwave" + gem "appraisal" + gem "simplecov" + gem "simplecov-json" + gem "generator_spec" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6_rc_mysql.gemfile.lock b/gemfiles/rails_6_rc_mysql.gemfile.lock new file mode 100644 index 0000000..7d57fe1 --- /dev/null +++ b/gemfiles/rails_6_rc_mysql.gemfile.lock @@ -0,0 +1,274 @@ +GIT + remote: git@github.com:collectiveidea/awesome_nested_set.git + revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123 + specs: + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0) + +PATH + remote: .. + specs: + nocms-blocks (1.2.0) + activeresource (>= 4.0.0, < 6.1) + awesome_nested_set (>= 3.0.0, < 3.2) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + mail (>= 2.7.1) + actionmailer (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.0.rc1) + actionview (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actiontext (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + nokogiri (>= 1.8.5) + actionview (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + globalid (>= 0.3.6) + activemodel (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + marcel (~> 0.3.1) + activesupport (6.0.0.rc1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.1, >= 2.1.4) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) + launchy (2.4.3) + addressable (~> 2.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mysql2 (0.5.2) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.0.rc1) + actioncable (= 6.0.0.rc1) + actionmailbox (= 6.0.0.rc1) + actionmailer (= 6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actiontext (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + bundler (>= 1.3.0) + railties (= 6.0.0.rc1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-json (0.2) + json + simplecov + slop (3.6.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.1.6) + +PLATFORMS + ruby + +DEPENDENCIES + actionpack (= 6.0.0.rc1) + appraisal + awesome_nested_set! + capybara (< 3.16) + capybara-screenshot + carrierwave + database_cleaner + factory_girl + faker + generator_spec + mysql2 + nocms-blocks! + pry-byebug + pry-nav + pry-rails + pry-remote + pry-stack_explorer + rails (= 6.0.0.rc1) + rspec-rails + simplecov + simplecov-json + +BUNDLED WITH + 1.17.3 diff --git a/gemfiles/rails_6_rc_pgsql.gemfile b/gemfiles/rails_6_rc_pgsql.gemfile new file mode 100644 index 0000000..ab37ee4 --- /dev/null +++ b/gemfiles/rails_6_rc_pgsql.gemfile @@ -0,0 +1,36 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "pg" +gem "rails", "6.0.0.rc1" +gem "actionpack", "6.0.0.rc1" +gem "activemodel", "6.0.0.rc1" +gem "activerecord", "6.0.0.rc1" +gem "activesupport", "6.0.0.rc1" +gem "railties", "6.0.0.rc1" +gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git" +gem "rspec-rails" + +group :development, :test do + gem "pry-rails" + gem "pry-byebug" + gem "pry-nav" + gem "pry-remote" + gem "pry-stack_explorer" +end + +group :test do + gem "capybara-screenshot" + gem "factory_girl" + gem "capybara", "< 3.16" + gem "database_cleaner" + gem "faker" + gem "carrierwave" + gem "appraisal" + gem "simplecov" + gem "simplecov-json" + gem "generator_spec" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6_rc_pgsql.gemfile.lock b/gemfiles/rails_6_rc_pgsql.gemfile.lock new file mode 100644 index 0000000..84d7eb7 --- /dev/null +++ b/gemfiles/rails_6_rc_pgsql.gemfile.lock @@ -0,0 +1,278 @@ +GIT + remote: git@github.com:collectiveidea/awesome_nested_set.git + revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123 + specs: + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0) + +PATH + remote: .. + specs: + nocms-blocks (1.2.0) + activeresource (>= 4.0.0, < 6.1) + awesome_nested_set (>= 3.0.0, < 3.2) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + mail (>= 2.7.1) + actionmailer (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.0.rc1) + actionview (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actiontext (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + nokogiri (>= 1.8.5) + actionview (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + globalid (>= 0.3.6) + activemodel (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + marcel (~> 0.3.1) + activesupport (6.0.0.rc1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.1, >= 2.1.4) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) + launchy (2.4.3) + addressable (~> 2.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.0.rc1) + actioncable (= 6.0.0.rc1) + actionmailbox (= 6.0.0.rc1) + actionmailer (= 6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actiontext (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + bundler (>= 1.3.0) + railties (= 6.0.0.rc1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-json (0.2) + json + simplecov + slop (3.6.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.1.6) + +PLATFORMS + ruby + +DEPENDENCIES + actionpack (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + appraisal + awesome_nested_set! + capybara (< 3.16) + capybara-screenshot + carrierwave + database_cleaner + factory_girl + faker + generator_spec + nocms-blocks! + pg + pry-byebug + pry-nav + pry-rails + pry-remote + pry-stack_explorer + rails (= 6.0.0.rc1) + railties (= 6.0.0.rc1) + rspec-rails + simplecov + simplecov-json + +BUNDLED WITH + 1.17.3 diff --git a/gemfiles/rails_6_rc_sqlite.gemfile b/gemfiles/rails_6_rc_sqlite.gemfile new file mode 100644 index 0000000..ea24529 --- /dev/null +++ b/gemfiles/rails_6_rc_sqlite.gemfile @@ -0,0 +1,36 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sqlite3" +gem "rails", "6.0.0.rc1" +gem "actionpack", "6.0.0.rc1" +gem "activemodel", "6.0.0.rc1" +gem "activerecord", "6.0.0.rc1" +gem "activesupport", "6.0.0.rc1" +gem "railties", "6.0.0.rc1" +gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git" +gem "rspec-rails" + +group :development, :test do + gem "pry-rails" + gem "pry-byebug" + gem "pry-nav" + gem "pry-remote" + gem "pry-stack_explorer" +end + +group :test do + gem "capybara-screenshot" + gem "factory_girl" + gem "capybara", "< 3.16" + gem "database_cleaner" + gem "faker" + gem "carrierwave" + gem "appraisal" + gem "simplecov" + gem "simplecov-json" + gem "generator_spec" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6_rc_sqlite.gemfile.lock b/gemfiles/rails_6_rc_sqlite.gemfile.lock new file mode 100644 index 0000000..8cdc63a --- /dev/null +++ b/gemfiles/rails_6_rc_sqlite.gemfile.lock @@ -0,0 +1,278 @@ +GIT + remote: git@github.com:collectiveidea/awesome_nested_set.git + revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123 + specs: + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0) + +PATH + remote: .. + specs: + nocms-blocks (1.2.0) + activeresource (>= 4.0.0, < 6.1) + awesome_nested_set (>= 3.0.0, < 3.2) + globalize (>= 4.0.0, < 5.4) + rails (>= 4.0.0, < 6.1) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + mail (>= 2.7.1) + actionmailer (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.0.rc1) + actionview (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actiontext (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + nokogiri (>= 1.8.5) + actionview (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + globalid (>= 0.3.6) + activemodel (6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + activeresource (5.1.0) + activemodel (>= 5.0, < 7) + activemodel-serializers-xml (~> 1.0) + activesupport (>= 5.0, < 7) + activestorage (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + marcel (~> 0.3.1) + activesupport (6.0.0.rc1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.1, >= 2.1.4) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (11.0.1) + capybara (3.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + database_cleaner (1.7.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.3.1) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + generator_spec (0.9.4) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (5.3.0) + activemodel (>= 4.2, < 6.1) + activerecord (>= 4.2, < 6.1) + request_store (~> 1.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + json (2.2.0) + launchy (2.4.3) + addressable (~> 2.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.7.0) + byebug (~> 11.0) + pry (~> 0.10) + pry-nav (0.3.0) + pry (>= 0.9.10, < 0.13.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) + pry-stack_explorer (0.4.9.3) + binding_of_caller (>= 0.7) + pry (>= 0.9.11) + public_suffix (3.1.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.0.rc1) + actioncable (= 6.0.0.rc1) + actionmailbox (= 6.0.0.rc1) + actionmailer (= 6.0.0.rc1) + actionpack (= 6.0.0.rc1) + actiontext (= 6.0.0.rc1) + actionview (= 6.0.0.rc1) + activejob (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activestorage (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + bundler (>= 1.3.0) + railties (= 6.0.0.rc1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (6.0.0.rc1) + actionpack (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (12.3.2) + regexp_parser (1.5.1) + request_store (1.4.1) + rack (>= 1.4) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-json (0.2) + json + simplecov + slop (3.6.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.4.1) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.1.6) + +PLATFORMS + ruby + +DEPENDENCIES + actionpack (= 6.0.0.rc1) + activemodel (= 6.0.0.rc1) + activerecord (= 6.0.0.rc1) + activesupport (= 6.0.0.rc1) + appraisal + awesome_nested_set! + capybara (< 3.16) + capybara-screenshot + carrierwave + database_cleaner + factory_girl + faker + generator_spec + nocms-blocks! + pry-byebug + pry-nav + pry-rails + pry-remote + pry-stack_explorer + rails (= 6.0.0.rc1) + railties (= 6.0.0.rc1) + rspec-rails + simplecov + simplecov-json + sqlite3 + +BUNDLED WITH + 1.17.3