summaryrefslogtreecommitdiff
path: root/Guardfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-10 09:09:07 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-10 09:09:07 -0700
commit3f01ec2d5b7421f05192fc78974a7ff4ba8c8daf (patch)
tree9dcad739d3ad2fea6df5108f86f052b279d7774d /Guardfile
parent8674fba173e520a67d60e6b5289dcd1bd648d537 (diff)
parent79eb5ab396690c613ea6e13c3c941ba1fa80f217 (diff)
downloadgitlab-ce-3f01ec2d5b7421f05192fc78974a7ff4ba8c8daf.tar.gz
Merge pull request #1426 from NARKOZ/spinach
Cucumber => Spinach
Diffstat (limited to 'Guardfile')
-rw-r--r--Guardfile16
1 files changed, 6 insertions, 10 deletions
diff --git a/Guardfile b/Guardfile
index ed38f548d6e..6ed414bc4c5 100644
--- a/Guardfile
+++ b/Guardfile
@@ -13,18 +13,14 @@ guard 'rspec', :version => 2 do
watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
watch('config/routes.rb') { "spec/routing" }
watch('app/controllers/application_controller.rb') { "spec/controllers" }
-
+
# Capybara request specs
watch(%r{^app/views/(.+)/.*\.(erb|haml)$}) { |m| "spec/requests/#{m[1]}_spec.rb" }
-
- # Turnip features and steps
- watch(%r{^spec/acceptance/(.+)\.feature$})
- watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
end
-
-guard 'cucumber' do
- watch(%r{^features/.+\.feature$})
- watch(%r{^features/support/.+$}) { 'features' }
- watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+guard 'spinach' do
+ watch(%r|^features/(.*)\.feature|)
+ watch(%r|^features/steps/(.*)([^/]+)\.rb|) do |m|
+ "features/#{m[1]}#{m[2]}.feature"
+ end
end