diff --git a/.travis.yml b/.travis.yml index 08118d9c..f8b3c2df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,14 +17,6 @@ cache: gemfile: Gemfile -#addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - g++-4.9 -# chrome: beta - env: global: - RAILS_ENV=test @@ -49,10 +41,6 @@ install: - bundle - yarn - google-chrome --version - - # Temp set chromediver to version matching chrome 73 - #- chromedriver-update 73.0.3683.68 - #- chromedriver --version - rake db:setup before_script: diff --git a/Gemfile.lock b/Gemfile.lock index 2680fa6d..33584a6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,65 +1,65 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.0) - actionpack (= 5.2.0) + actioncable (5.2.2.1) + actionpack (= 5.2.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.0) - actionpack (= 5.2.0) - actionview (= 5.2.0) - activejob (= 5.2.0) + actionmailer (5.2.2.1) + actionpack (= 5.2.2.1) + actionview (= 5.2.2.1) + activejob (= 5.2.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.0) - actionview (= 5.2.0) - activesupport (= 5.2.0) + actionpack (5.2.2.1) + actionview (= 5.2.2.1) + activesupport (= 5.2.2.1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.0) - activesupport (= 5.2.0) + actionview (5.2.2.1) + activesupport (= 5.2.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.0) - activesupport (= 5.2.0) + activejob (5.2.2.1) + activesupport (= 5.2.2.1) globalid (>= 0.3.6) - activemodel (5.2.0) - activesupport (= 5.2.0) - activerecord (5.2.0) - activemodel (= 5.2.0) - activesupport (= 5.2.0) + activemodel (5.2.2.1) + activesupport (= 5.2.2.1) + activerecord (5.2.2.1) + activemodel (= 5.2.2.1) + activesupport (= 5.2.2.1) arel (>= 9.0) - activestorage (5.2.0) - actionpack (= 5.2.0) - activerecord (= 5.2.0) + activestorage (5.2.2.1) + actionpack (= 5.2.2.1) + activerecord (= 5.2.2.1) marcel (~> 0.3.1) - activesupport (5.2.0) + activesupport (5.2.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) archive-zip (0.12.0) io-like (~> 0.3.0) arel (9.0.0) ast (2.4.0) - autoprefixer-rails (8.5.0) + autoprefixer-rails (9.5.0) execjs awesome_print (1.8.0) bindex (0.5.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - brakeman (4.3.0) + brakeman (4.5.0) builder (3.2.3) - bundler-audit (0.6.0) - bundler (~> 1.2) + bundler-audit (0.6.1) + bundler (>= 1.2.0, < 3) thor (~> 0.18) - byebug (10.0.2) + byebug (11.0.0) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -67,7 +67,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) - capybara-screenshot (1.0.21) + capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy childprocess (0.9.0) @@ -85,11 +85,11 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.5) connection_pool (2.2.2) - coveralls (0.8.21) + coveralls (0.8.22) json (>= 1.8, < 3) - simplecov (~> 0.14.1) + simplecov (~> 0.16.1) term-ansicolor (~> 1.3) thor (~> 0.19.4) tins (~> 1.6) @@ -97,31 +97,32 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) - erubi (1.7.1) + docile (1.3.1) + erubi (1.8.0) erubis (2.7.0) execjs (2.7.0) - factory_bot (4.8.2) - activesupport (>= 3.0.0) - factory_bot_rails (4.8.2) - factory_bot (~> 4.8.2) - railties (>= 3.0.0) - ffi (1.9.23) - foreman (0.84.0) + factory_bot (5.0.2) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.1) + factory_bot (~> 5.0.0) + railties (>= 4.2.0) + ffi (1.10.0) + foreman (0.85.0) thor (~> 0.19.1) generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.0.1) + i18n (1.6.0) concurrent-ruby (~> 1.0) interception (0.5) io-like (0.3.0) - jbuilder (2.7.0) + jaro_winkler (1.5.2) + jbuilder (2.8.0) activesupport (>= 4.2.0) multi_json (>= 1.2) - json (2.1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) libv8 (6.7.288.46.1) @@ -129,16 +130,16 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.2) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.2) + marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.0) - mimemagic (0.3.2) - mini_mime (1.0.0) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) mini_portile2 (2.4.0) mini_racer (0.2.4) libv8 (>= 6.3) @@ -147,54 +148,55 @@ GEM nio4r (2.3.1) nokogiri (1.10.1) mini_portile2 (~> 2.4.0) - parallel (1.12.1) - parser (2.5.1.0) + parallel (1.14.0) + parser (2.6.0.0) ast (~> 2.4.0) - pg (1.0.0) - powerpack (0.1.1) - pry (0.11.3) + pg (1.1.4) + powerpack (0.1.2) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pry-doc (0.13.4) + pry-doc (1.0.0) pry (~> 0.11) yard (~> 0.9.11) - pry-rails (0.3.6) + pry-rails (0.3.9) pry (>= 0.10.4) - pry-rescue (1.4.5) + pry-rescue (1.5.0) interception (>= 0.5) - pry - pry-stack_explorer (0.4.9.2) + pry (>= 0.12.0) + pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (3.0.2) - puma (3.11.4) - rack (2.0.5) - rack-proxy (0.6.4) + psych (3.1.0) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.6) + rack-proxy (0.6.5) rack - rack-test (1.0.0) + rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.0) - actioncable (= 5.2.0) - actionmailer (= 5.2.0) - actionpack (= 5.2.0) - actionview (= 5.2.0) - activejob (= 5.2.0) - activemodel (= 5.2.0) - activerecord (= 5.2.0) - activestorage (= 5.2.0) - activesupport (= 5.2.0) + rails (5.2.2.1) + actioncable (= 5.2.2.1) + actionmailer (= 5.2.2.1) + actionpack (= 5.2.2.1) + actionview (= 5.2.2.1) + activejob (= 5.2.2.1) + activemodel (= 5.2.2.1) + activerecord (= 5.2.2.1) + activestorage (= 5.2.2.1) + activesupport (= 5.2.2.1) bundler (>= 1.3.0) - railties (= 5.2.0) + railties (= 5.2.2.1) 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) - rails_best_practices (1.19.2) + rails_best_practices (1.19.4) activesupport code_analyzer (>= 0.4.8) erubis @@ -202,18 +204,18 @@ GEM json require_all (~> 2.0) ruby-progressbar - railties (5.2.0) - actionpack (= 5.2.0) - activesupport (= 5.2.0) + railties (5.2.2.1) + actionpack (= 5.2.2.1) + activesupport (= 5.2.2.1) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rdoc (6.0.4) + rb-inotify (0.10.0) + ffi (~> 1.0) + rdoc (6.1.1) react_on_rails (11.2.2) addressable connection_pool @@ -239,20 +241,22 @@ GEM rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) rspec-support (3.7.1) - rubocop (0.56.0) + rubocop (0.65.0) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) + psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) + unicode-display_width (~> 1.4.0) ruby-lint (2.3.1) parser (~> 2.2) slop (~> 3.4, >= 3.4.7) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) ruby_dep (1.5.0) - rubyzip (1.2.1) - sass (3.5.6) + rubyzip (1.2.2) + sass (3.7.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -263,17 +267,17 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - scss_lint (0.57.0) + scss_lint (0.57.1) rake (>= 0.9, < 13) - sass (~> 3.5.5) + sass (~> 3.5, >= 3.5.5) sdoc (1.0.0) rdoc (>= 5.0) - selenium-webdriver (3.12.0) + selenium-webdriver (3.141.0) childprocess (~> 0.5) - rubyzip (~> 1.2) - sexp_processor (4.11.0) - simplecov (0.14.1) - docile (~> 1.1.0) + rubyzip (~> 1.2, >= 1.2.2) + sexp_processor (4.12.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) @@ -282,39 +286,39 @@ GEM activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.7.1) + 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) - term-ansicolor (1.6.0) + term-ansicolor (1.7.1) tins (~> 1.0) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.8) - tins (1.16.3) + tilt (2.0.9) + tins (1.20.2) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.10) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) - unicode-display_width (1.3.2) - web-console (3.6.2) + unicode-display_width (1.4.1) + web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webpacker (3.5.3) + webpacker (4.0.2) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xpath (3.0.0) + xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.12) + yard (0.9.18) PLATFORMS ruby diff --git a/config/webpacker.yml b/config/webpacker.yml index 4e01b27a..d86d1e5c 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -12,6 +12,9 @@ default: &default # Important to set this to false if not using the webpacker webpack setup compile: false + # default to building the extracted CSS file + extract_css: true + development: <<: *default @@ -20,6 +23,8 @@ development: port: 3035 hmr: true https: false + # Hot reloading doesn't want an extracted CSS file + extract_css: false test: <<: *default diff --git a/spec/factories.rb b/spec/factories.rb index 8ce9a5cd..fd2f36cc 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -1,7 +1,7 @@ # This will guess the User class FactoryBot.define do factory :comment do - author "John" - text "This is a comment text." + author { "John" } + text { "This is a comment text." } end end