summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2017-12-04 17:37:50 +0000
committerSamuel Giddins <segiddins@segiddins.me>2017-12-12 14:46:42 -0600
commit6e13729d1ac66048dd93390fa3cf8e1165fc4698 (patch)
tree51e92a5f340df77fc968132fb563fbbfae9cf988
parentd94badec10aae8f163c900675384976ecf9678b3 (diff)
downloadbundler-6e13729d1ac66048dd93390fa3cf8e1165fc4698.tar.gz
Auto merge of #6200 - voxik:relax-directory-restrictions, r=segiddins
Allow test execution in paths containing dash. PR #5036 added restriction on what characters can be contained in path, from where the specs are executed. But they dissallows even dash, which is hopefully handled just fine on all systems. This patch fixes #6185 by relaxing the restriction a bit and allowing path to contain dash. (cherry picked from commit 5566b687c135178561f7524d3a5cb68fee56e416)
-rw-r--r--spec/spec_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a0925bb679..b8fe2a6ce1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -20,7 +20,7 @@ rescue LoadError
abort "Run rake spec:deps to install development dependencies"
end
-if File.expand_path(__FILE__) =~ %r{([^\w/\.])}
+if File.expand_path(__FILE__) =~ %r{([^\w/\.-])}
abort "The bundler specs cannot be run from a path that contains special characters (particularly #{$1.inspect})"
end