Skip to content

Commit 536003c

Browse files
authored
Merge pull request #1024 from jmerle/fix-openjdk-read-file
Fix OpenJDK scraper
2 parents 482d870 + b31dc9d commit 536003c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/docs/core/scrapers/file_scraper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def assert_source_directory_exists
2929

3030
def request_one(url)
3131
assert_source_directory_exists
32-
Response.new read_file(url_to_path(url)), URL.parse(url)
32+
Response.new read_file(File.join(source_directory, url_to_path(url))), URL.parse(url)
3333
end
3434

3535
def request_all(urls)
@@ -50,7 +50,7 @@ def url_to_path(url)
5050
end
5151

5252
def read_file(path)
53-
File.read(File.join(source_directory, path))
53+
File.read(path)
5454
rescue
5555
instrument 'warn.doc', msg: "Failed to open file: #{path}"
5656
nil

test/lib/docs/core/scrapers/file_scraper_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class Scraper < Docs::FileScraper
6363
end
6464

6565
it "reads a file" do
66-
mock(scraper).read_file(path)
66+
mock(scraper).read_file(File.join(ROOT_PATH, 'docs/scraper', path))
6767
result
6868
end
6969

@@ -165,7 +165,7 @@ class Scraper < Docs::FileScraper
165165

166166
describe "#read_file" do
167167
let :result do
168-
scraper.send :read_file, 'file'
168+
scraper.send :read_file, File.join(ROOT_PATH, 'docs', 'scraper', 'file')
169169
end
170170

171171
it "returns the file's content when the file exists in the source directory" do

0 commit comments

Comments
 (0)