diff options
| author | Tim Smith <tsmith@chef.io> | 2020-09-16 11:25:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 11:25:16 -0700 |
| commit | bc0c1d0694ed57c944da957a31a6f6cac01bff39 (patch) | |
| tree | 6d2d5ef9a39734ac1c16cce63d475916e1ba44cb | |
| parent | 9818855311012a9be130396566a56c094b8a9e97 (diff) | |
| parent | e65cf556091cd7e056e2ccd52fa811b18ebcdff1 (diff) | |
| download | mixlib-cli-bc0c1d0694ed57c944da957a31a6f6cac01bff39.tar.gz | |
Merge pull request #79 from chef/file_dir
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | mixlib-cli.gemspec | 2 | ||||
| -rw-r--r-- | spec/mixlib/cli_spec.rb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
4 files changed, 3 insertions, 4 deletions
@@ -10,8 +10,8 @@ end group :test do gem "chefstyle" - gem "rspec", "~> 3.0" gem "rake" + gem "rspec", "~> 3.0" end group :debug do diff --git a/mixlib-cli.gemspec b/mixlib-cli.gemspec index d36d660..cbfa973 100644 --- a/mixlib-cli.gemspec +++ b/mixlib-cli.gemspec @@ -1,4 +1,4 @@ -$:.unshift(File.dirname(__FILE__) + "/lib") +$:.unshift(__dir__ + "/lib") require "mixlib/cli/version" Gem::Specification.new do |s| diff --git a/spec/mixlib/cli_spec.rb b/spec/mixlib/cli_spec.rb index ec9435c..922f28b 100644 --- a/spec/mixlib/cli_spec.rb +++ b/spec/mixlib/cli_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper")) +require "spec_helper" describe Mixlib::CLI do after(:each) do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ffbde8a..6c9dc6c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,4 @@ $TESTING = true -$:.push File.join(File.dirname(__FILE__), "..", "lib") require "mixlib/cli" |