Merge pull request #7517 from jvanbaarsen/guard-spring-fix

Updated the spring gem and fixed the guard file

Gemfile

@@ -231,7 +231,7 @@ group :development, :test do
 
   gem 'jasmine', '2.0.2'
 
-  gem "spring", '1.1.1'
+  gem "spring", '1.1.3'
   gem "spring-commands-rspec", '1.0.1'
   gem "spring-commands-spinach", '1.0.0'
 end

Gemfile.lock

@@ -489,7 +489,7 @@ GEM
       capybara (>= 2.0.0)
       railties (>= 3)
       spinach (>= 0.4)
-    spring (1.1.1)
+    spring (1.1.3)
     spring-commands-rspec (1.0.1)
       spring (>= 0.9.1)
     spring-commands-spinach (1.0.0)
@@ -676,7 +676,7 @@ DEPENDENCIES
   slack-notifier (~> 0.3.2)
   slim
   spinach-rails
-  spring (= 1.1.1)
+  spring (= 1.1.3)
   spring-commands-rspec (= 1.0.1)
   spring-commands-spinach (= 1.0.0)
   stamp

Guardfile

 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', cmd: "spring rspec", version: 2, all_on_start: false, all_after_pass: false do
+guard 'rspec', cmd: "spring rspec", all_on_start: false, all_after_pass: false do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch(%r{^lib/api/(.+)\.rb$})     { |m| "spec/requests/api/#{m[1]}_spec.rb" }
@@ -19,7 +19,7 @@ guard 'rspec', cmd: "spring rspec", version: 2, all_on_start: false, all_after_p
   watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
 end
 
-guard 'spinach' do
+guard 'spinach', command_prefix: 'spring' do
   watch(%r|^features/(.*)\.feature|)
   watch(%r|^features/steps/(.*)([^/]+)\.rb|) do |m|
     "features/#{m[1]}#{m[2]}.feature"