diff --git a/Gemfile b/Gemfile index ddc589a67..4eb7880a4 100644 --- a/Gemfile +++ b/Gemfile @@ -120,7 +120,7 @@ group :development do gem "easy_translate", "~> 0.5.1" # Google translate tie-in to be used with i18n tasks gem "erb_lint", "~> 0.0.37", require: false # ERB Linter tool gem "guard", "~> 2.18", require: false # Guard is a command line tool to easily handle events on file system modifications - gem "guard-livereload", "~> 2.5", require: false # Guard::LiveReload automatically reloads your browser when 'view' files are modified + gem "guard-rspec", "~> 4.7", require: false # Guard::Rspec includes a DSL for running tests on change gem "i18n-tasks", "~> 1.0.11" # Helpers to find and manage missing and unused translations gem "listen", "~> 3.7", require: false # Helps 'listen' to file system modifications events (also used by other gems like guard) gem "memory_profiler", "~> 1.0", require: false # Memory profiling routines for Ruby 2.3+ diff --git a/Gemfile.lock b/Gemfile.lock index b7d9bd8e8..25d527546 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,9 +228,6 @@ GEM easy_translate (0.5.1) thread thread_safe - em-websocket (0.5.2) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) email_validator (2.2.3) activemodel emoji_regex (3.2.3) @@ -247,7 +244,6 @@ GEM erubi (1.10.0) et-orbi (1.2.7) tzinfo - eventmachine (1.2.7) excon (0.92.3) execjs (2.8.1) exifr (1.3.9) @@ -360,11 +356,10 @@ GEM shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) - guard-livereload (2.5.2) - em-websocket (~> 0.5) - guard (~> 2.8) - guard-compat (~> 1.0) - multi_json (~> 1.8) + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) hairtrigger (0.2.25) activerecord (>= 5.0, < 8) ruby2ruby (~> 2.4) @@ -719,6 +714,10 @@ GEM webpush (~> 1.0) rpush-redis (1.2.0) modis (>= 3.0, < 5.0) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) rspec-core (3.11.0) rspec-support (~> 3.11.0) rspec-expectations (3.11.0) @@ -1002,7 +1001,7 @@ DEPENDENCIES gemoji (~> 4.0.0.rc3) gibbon (~> 3.4) guard (~> 2.18) - guard-livereload (~> 2.5) + guard-rspec (~> 4.7) hairtrigger (~> 0.2.25) honeybadger (~> 4.12) honeycomb-beeline (~> 2.11.0) diff --git a/Guardfile b/Guardfile index 01303d05c..a32825002 100644 --- a/Guardfile +++ b/Guardfile @@ -1,25 +1,3 @@ -# A sample Guardfile -# More info at https://github.com/guard/guard#readme - -## Uncomment and set this to only include directories you want to watch -# directories %w(app lib config test spec features) \ -# .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")} - -## Note: if you are using the `directories` clause above and you are not -## watching the project directory ('.'), then you will want to move -## the Guardfile to a watched dir and symlink it back, e.g. -# -# $ mkdir config -# $ mv Guardfile config/ -# $ ln -s config/Guardfile . -# -# and, you'll have to watch "config/Guardfile" instead of "Guardfile" - -# NOTE: The cmd option is now required due to the increasing number of ways -# rspec may be run, below are examples of the most common uses. -# * bundler: 'bundle exec rspec' -# * bundler binstubs: 'bin/rspec' -# * 'just' rspec: 'rspec' ignore([%r{^bin/*}, %r{^config/*}, %r{^db/*}, %r{^lib/*}, %r{^log/*}, %r{^public/*}, %r{^tmp/*}, %r{^node_modules/*}]) @@ -74,13 +52,3 @@ guard :rspec, rspec_options do Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance" end end - -guard :livereload do - watch(%r{app/views/.+\.(erb|haml|slim)$}) - watch(%r{app/helpers/.+\.rb}) - watch(%r{public/.+\.(css|js|html)}) - watch(%r{config/locales/.+\.yml}) - # Rails Assets Pipeline - watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" } - watch(%r{(app|vendor)(/assets/\w+/(.+)\.(scss))}) { |m| "/assets/#{m[3]}.css" } -end diff --git a/vendor/cache/em-websocket-0.5.2.gem b/vendor/cache/em-websocket-0.5.2.gem deleted file mode 100644 index 270446fed..000000000 Binary files a/vendor/cache/em-websocket-0.5.2.gem and /dev/null differ diff --git a/vendor/cache/eventmachine-1.2.7.gem b/vendor/cache/eventmachine-1.2.7.gem deleted file mode 100644 index 708d366b8..000000000 Binary files a/vendor/cache/eventmachine-1.2.7.gem and /dev/null differ diff --git a/vendor/cache/guard-livereload-2.5.2.gem b/vendor/cache/guard-livereload-2.5.2.gem deleted file mode 100644 index ee5c9723a..000000000 Binary files a/vendor/cache/guard-livereload-2.5.2.gem and /dev/null differ diff --git a/vendor/cache/guard-rspec-4.7.3.gem b/vendor/cache/guard-rspec-4.7.3.gem new file mode 100644 index 000000000..4ffbe3e40 Binary files /dev/null and b/vendor/cache/guard-rspec-4.7.3.gem differ diff --git a/vendor/cache/rspec-3.11.0.gem b/vendor/cache/rspec-3.11.0.gem new file mode 100644 index 000000000..2073e5bed Binary files /dev/null and b/vendor/cache/rspec-3.11.0.gem differ