Merge pull request #695 from decko-commons/ethn-wikirate

gemspec fixes

Gemfile.lock

@@ -7,26 +7,26 @@ PATH
       actionview (~> 6.1.3.1)
       activejob (~> 6.1.3.1)
       activerecord (~> 6.1.3.1)
-      activerecord-import (~> 1.0)
+      activerecord-import (>= 1.0)
       activestorage (~> 6.1.3.1)
-      bootstrap4-kaminari-views (~> 1.0)
+      bootstrap4-kaminari-views (>= 1.0)
       cardname (= 0.12.0)
-      coderay (~> 1.1)
-      coffee-script (~> 2.4)
-      colorize (~> 0.8)
-      diff-lcs (~> 1.3)
-      haml (~> 5.0)
-      jwt (~> 2.2)
-      kaminari (~> 1.0)
+      coderay (>= 1.1)
+      coffee-script (>= 2.4)
+      colorize (>= 0.8)
+      diff-lcs (>= 1.3)
+      haml (>= 5.0)
+      jwt (>= 2.2)
+      kaminari (>= 1.0)
       railties (~> 6.1.3.1)
-      rake (~> 13.0)
-      sassc (~> 2.0)
+      rake (>= 13.0)
+      sassc (>= 2.0)
       sprockets (~> 3.7)
       sprockets-rails (>= 2.0)
-      uglifier (~> 4.2)
+      uglifier (>= 4.2)
     cardname (0.12.0)
-      activesupport (~> 6)
-      htmlentities (~> 4.3)
+      activesupport (>= 6)
+      htmlentities (>= 4.3)
     decko (0.12.0)
       actionpack (~> 6.1.3.1)
       card (= 1.102.0)
@@ -62,8 +62,8 @@ PATH
       card (= 1.102.0)
       card-mod-history (= 0.12.0)
       card-mod-permissions (= 0.12.0)
-      carrierwave (~> 2.2.1)
-      mini_magick (~> 4.2)
+      carrierwave (>= 2.2.1)
+      mini_magick (>= 4.2)
     card-mod-collection (0.12.0)
       card (= 1.102.0)
     card-mod-comment (0.12.0)
@@ -103,9 +103,9 @@ PATH
       card-mod-tinymce_editor (= 0.12.0)
     card-mod-delayed_job (0.12.0)
       card (= 1.102.0)
-      daemons
+      daemons (>= 1.4)
       delayed_job_active_record (>= 4.1)
-      delayed_job_web
+      delayed_job_web (>= 1.4.4)
     card-mod-edit (0.12.0)
       card (= 1.102.0)
     card-mod-email (0.12.0)
@@ -118,7 +118,7 @@ PATH
       card-mod-content (= 0.12.0)
     card-mod-google_analytics (0.12.0)
       card (= 1.102.0)
-      staccato
+      staccato (>= 0.5.3)
     card-mod-help (0.12.0)
       card (= 1.102.0)
     card-mod-history (0.12.0)
@@ -144,24 +144,23 @@ PATH
       execjs (~> 2.7, != 2.8.0)
     card-mod-markdown (0.12.0)
       card (= 1.102.0)
-      kramdown
+      kramdown (>= 2.3)
     card-mod-monkey (0.12.0)
-      better_errors
-      card (= 1.102.0)
-      colorize
-      html2haml
-      pry-byebug
-      pry-rails
-      pry-rescue
-      pry-stack_explorer
-      rubocop
+      better_errors (>= 2.9.1)
+      card (= 1.102.0)
+      colorize (>= 0.8.1)
+      html2haml (>= 2.2)
+      pry-byebug (>= 3.9)
+      pry-rails (>= 0.3.9)
+      pry-rescue (>= 1.5.2)
+      pry-stack_explorer (>= 0.6.1)
+      rubocop (>= 1.17)
     card-mod-permissions (0.12.0)
       card (= 1.102.0)
     card-mod-platypus (0.12.0)
       card (= 1.102.0)
-      codeclimate-test-reporter
-      fog-aws
-      yard
+      fog-aws (>= 3.10)
+      yard (>= 0.9.26)
     card-mod-prosemirror_editor (0.12.0)
       card (= 1.102.0)
       card-mod-edit (= 0.12.0)
@@ -196,39 +195,35 @@ PATH
   remote: support
   specs:
     decko-cucumber (0.12.0)
-      capybara (>= 3.35)
-      capybara-puma
-      cucumber (>= 5)
-      cucumber-expressions (>= 8.3)
+      capybara-puma (>= 1.0)
       cucumber-rails (>= 2.3)
       database_cleaner (>= 2.0.1)
-      email_spec
-      launchy
-      rspec
+      email_spec (>= 2.2)
+      launchy (>= 2.5)
       simplecov (>= 0.21)
-      webdrivers
+      webdrivers (>= 4.6)
     decko-cypress (0.12.0)
-      cypress-on-rails (~> 1.4)
+      cypress-on-rails (>= 1.4)
     decko-profile (0.12.0)
-      ruby-prof
+      ruby-prof (>= 1.4.3)
     decko-rspec (0.12.0)
       i18n-tasks (>= 0.9.5)
-      minitest
-      nokogumbo
-      rails-controller-testing
-      rr
-      rspec
-      rspec-html-matchers (= 0.9.1)
+      minitest (>= 5.14.4)
+      nokogumbo (>= 2.0.5)
+      rails-controller-testing (>= 1.0.4)
+      rr (>= 3.0.5)
+      rspec (>= 3.10)
+      rspec-html-matchers (>= 0.9.4)
       rspec-rails (>= 5)
-      rubocop-rspec
+      rubocop-rspec (>= 2.4)
       simplecov (>= 0.21)
       spork (>= 0.9)
-      timecop
+      timecop (>= 0.9.4)
     decko-spring (0.12.0)
-      listen (= 3.0.6)
-      spring
-      spring-commands-cucumber
-      spring-commands-rspec
+      listen (>= 3.5.1)
+      spring (>= 2.1.1)
+      spring-commands-cucumber (>= 1.0.1)
+      spring-commands-rspec (>= 1.0.4)
 
 GEM
   remote: http://rubygems.org/
@@ -328,8 +323,6 @@ GEM
       mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
     childprocess (3.0.0)
-    codeclimate-test-reporter (1.0.7)
-      simplecov
     coderay (1.1.3)
     coffee-script (2.4.1)
       coffee-script-source
@@ -358,7 +351,6 @@ GEM
       cucumber-messages (~> 13.1, >= 13.1.0)
       sys-uname (~> 1.2, >= 1.2.1)
     cucumber-cucumber-expressions (10.3.0)
-    cucumber-expressions (8.3.0)
     cucumber-gherkin (15.0.2)
       cucumber-messages (~> 13.0, >= 13.0.1)
     cucumber-html-formatter (9.0.0)
@@ -472,9 +464,9 @@ GEM
       rexml
     launchy (2.5.0)
       addressable (~> 2.7)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    listen (3.5.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -509,12 +501,12 @@ GEM
       middleware
       thor
       thread_safe
-    pry (0.14.1)
+    pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.8.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
+      pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-rescue (1.5.2)
@@ -574,7 +566,7 @@ GEM
       json
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rr (3.0.4)
+    rr (3.0.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -584,7 +576,7 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-html-matchers (0.9.1)
+    rspec-html-matchers (0.9.4)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
     rspec-mocks (3.10.2)

card/card.gemspec

@@ -19,27 +19,27 @@ DeckoGem.gem "card" do |s, d|
 
   d.depends_on(
     ["cardname",             d.decko_version],
-    ["rake",                       "~> 13.0"],
+    ["rake",                       ">= 13.0"],
     ["sprockets-rails",             ">= 2.0"],
-    ["colorize",                    "~> 0.8"], # livelier cli outputs
+    ["colorize",                    ">= 0.8"], # livelier cli outputs
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # MOVE TO MODS?
     # card-mod-format
-    ["haml",                        "~> 5.0"], # markup language used in view API
+    ["haml",                        ">= 5.0"], # markup language used in view API
     # card-mod-account
-    ["jwt",                         "~> 2.2"], # used in token.rb
+    ["jwt",                         ">= 2.2"], # used in token.rb
     # assets (JavaScript, CSS, etc)
-    ["coderay",                     "~> 1.1"],
-    ["sassc",                       "~> 2.0"],
-    ["coffee-script",               "~> 2.4"],
-    ["uglifier",                    "~> 4.2"],
+    ["coderay",                     ">= 1.1"],
+    ["sassc",                       ">= 2.0"],
+    ["coffee-script",               ">= 2.4"],
+    ["uglifier",                    ">= 4.2"],
     ["sprockets",                   "~> 3.7"], # sprockets 4 requires new configuration
     # pagination
-    ["kaminari",                    "~> 1.0"],
-    ["bootstrap4-kaminari-views",   "~> 1.0"],
+    ["kaminari",                    ">= 1.0"],
+    ["bootstrap4-kaminari-views",   ">= 1.0"],
     # other
-    ["diff-lcs",                    "~> 1.3"], # content diffs in histories
-    ["activerecord-import",         "~> 1.0"]
+    ["diff-lcs",                    ">= 1.3"], # content diffs in histories
+    ["activerecord-import",         ">= 1.0"]
   )
   %w[
     activerecord

cardname/cardname.gemspec

@@ -12,6 +12,6 @@ DeckoGem.gem "cardname" do |s, _d|
     "lib/**/*"
   ]
 
-  s.add_dependency "activesupport", "~> 6"
-  s.add_dependency "htmlentities",  "~> 4.3"
+  s.add_dependency "activesupport", ">= 6"
+  s.add_dependency "htmlentities", ">= 4.3"
 end

decko/features/step_definitions/web_steps.rb

@@ -127,11 +127,6 @@
 
 Then /^(?:|I )should see "([^"]*)"$/ do |text|
   expect(page).to have_content(text)
-  # this is preventing an upgrade to capybara 3, because there
-  # are a bunch of line breaks that our cuke expectations can't handle
-  #
-  # once we're at capybara 3.5 we can use `normalize_ws: true` (ws = white space)
-  # in have_content
 end
 
 Then /^(?:|I )should see in search "([^"]*)"$/ do |text|

decko/features/support/decko_env.rb

@@ -3,31 +3,17 @@
 require "email_spec"
 require "email_spec/cucumber"
 
-World(RSpec::Matchers)
-require "rspec-html-matchers"
-World(RSpecHtmlMatchers)
-
 Before do
   Cardio.seed_test_db
 end
 
-# Before("not @background-jobs", "not @delayed-jobs", "not @javascript") do
-#   DatabaseCleaner.strategy = :transaction
-#   DatabaseCleaner.start
-# end
-#
-# After("not @background-jobs", "not @delayed-jobs", "not @javascript") do
-#   DatabaseCleaner.clean
-# end
-
 at_exit do
   Cardio.seed_test_db
 end
-# frozen_string_literal: true
 
-# Before("@javascript") do
-#   @javascript = true
-# end
+Before("@javascript") do
+  @javascript = true
+end
 
 Capybara.configure do |config|
   config.match = :prefer_exact

mod/carrierwave/card-mod-carrierwave.gemspec

@@ -5,7 +5,7 @@ require "../../decko_gem"
 DeckoGem.mod "carrierwave" do |s, d|
   s.summary = "File and Image handling"
   s.description = ""
-  d.depends_on ["carrierwave", "~>2.2.1"],
-               ["mini_magick", "~> 4.2"]
+  d.depends_on ["carrierwave", ">= 2.2.1"],
+               ["mini_magick",   ">= 4.2"]
   d.depends_on_mod :history, :permissions
 end

mod/delayed_job/card-mod-delayed_job.gemspec

@@ -5,7 +5,7 @@ require "../../decko_gem"
 DeckoGem.mod "delayed_job" do |s, d|
   s.summary = "Background processing with Delayed Job"
   s.description = ""
-  d.depends_on "daemons",
+  d.depends_on ["daemons",                   ">= 1.4"],
                ["delayed_job_active_record", ">= 4.1"],
-               "delayed_job_web"
+               ["delayed_job_web",         ">= 1.4.4"]
 end

mod/google_analytics/card-mod-google_analytics.gemspec

@@ -5,5 +5,5 @@ require "../../decko_gem"
 DeckoGem.mod "google_analytics" do |s, d|
   s.summary = "Google Analytics support for decko"
   s.description = ""
-  d.depends_on "staccato"
+  d.depends_on ["staccato", ">= 0.5.3"]
 end

mod/layout/spec/set/type/layout_type_spec.rb

@@ -19,7 +19,7 @@
 
   it "takes effect immediately when content changed" do
     layout = Card["Default Layout"]
-    expect(format_subject.show(nil, {})).to have_tag :body do
+    expect(format_subject.show(nil, {})).to have_tag :body, with: { class: "d-flex" } do
       without_tag :aside
     end
     Card::Auth.as_bot { layout.update_attributes! content: TMP_LAYOUT }

mod/markdown/card-mod-markdown.gemspec

@@ -5,5 +5,5 @@ require "../../decko_gem"
 DeckoGem.mod "markdown" do |s, d|
   s.summary = "markdown support for decko"
   s.description = "use markdown in decko card content"
-  d.depends_on "kramdown"
+  d.depends_on ["kramdown", ">= 2.3"]
 end

mod/monkey/card-mod-monkey.gemspec

@@ -5,16 +5,16 @@ require "../../decko_gem"
 DeckoGem.mod "monkey" do |s, d|
   s.summary = "dev support for mod developers (monkeys)"
   s.description = ""
-  d.depends_on "colorize",
+  d.depends_on ["colorize",           ">= 0.8.1"],
                # CODE GENERATION
-               "html2haml",
+               ["html2haml",            ">= 2.2"],
                # CODE STYLE
-               "rubocop",      # 0.89 introduced bugs.
+               ["rubocop",             ">= 1.17"],
                # ["rubocop-decko"],
                # DEBUGGING
-               "better_errors",
-               "pry-rails",
-               "pry-rescue",
-               "pry-stack_explorer",
-               "pry-byebug"
+               ["better_errors",      ">= 2.9.1"],
+               ["pry-rails",          ">= 0.3.9"],
+               ["pry-rescue",         ">= 1.5.2"],
+               ["pry-stack_explorer", ">= 0.6.1"],
+               ["pry-byebug",           ">= 3.9"]
 end