Skip to content

Commit d5d84ce

Browse files
committed
Use __dir__ instead of __FILE__ where possible
1 parent 6adf13a commit d5d84ce

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

spec/core/middleware/request/upload_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
describe ZendeskAPI::Middleware::Request::Upload do
55
subject { ZendeskAPI::Middleware::Request::Upload.new(lambda { |env| env }) }
6-
let(:filename) { File.join(File.dirname(__FILE__), "test.jpg") }
6+
let(:filename) { File.join(__dir__, "test.jpg") }
77

88
it "should handle no body" do
99
expect(subject.call({})).to eq({})

spec/core/spec_helper.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
$:.unshift(File.join(File.dirname(__FILE__), "macros"))
2-
31
ENV["TZ"] = "CET" # something that is not local and not utc so we find all the bugs
42

53
require "zendesk_api"
@@ -28,7 +26,7 @@ def encoding_aware?
2826

2927
# tests fail when this is included in a Module (someone else also defines client)
3028
def client
31-
credentials = File.join(File.dirname(__FILE__), "..", "fixtures", "credentials.yml")
29+
credentials = File.join(__dir__, "..", "fixtures", "credentials.yml")
3230
@client ||= begin
3331
client = ZendeskAPI::Client.new do |config|
3432
if File.exist?(credentials)
@@ -157,7 +155,7 @@ def stub_json_request(verb, path_matcher, body = json, options = {})
157155
end
158156

159157
VCR.configure do |c|
160-
c.cassette_library_dir = File.join(File.dirname(__FILE__), "..", "fixtures", "cassettes")
158+
c.cassette_library_dir = File.join(__dir__, "..", "fixtures", "cassettes")
161159
c.default_cassette_options = {record: :new_episodes, decode_compressed_response: true, serialize_with: :json, preserve_exact_body_bytes: true}
162160
c.hook_into :webmock
163161
c.configure_rspec_metadata!

zendesk_api.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
lib = File.expand_path("../lib/", __FILE__)
1+
lib = File.expand_path("lib", __dir__)
22
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
33

44
require "zendesk_api/version"

0 commit comments

Comments
 (0)