Commit d3b993a
Changed files (2)
app
models
csv
spec
models
csv
app/models/csv/import.rb
@@ -9,7 +9,7 @@ class Csv::Import
end
def can_parse?(directory)
- File.exist?(database_file(directory))
+ database_file(directory).present?
end
def import_from(directory)
@@ -23,7 +23,7 @@ class Csv::Import
private
def database_file(dir)
- "#{dir}/spreadsheet-stronglifts.csv"
+ Dir.glob("#{dir}/spreadsheet-stronglifts*csv*").first
end
def import(row)
spec/models/csv/import_spec.rb
@@ -10,7 +10,8 @@ describe Csv::Import do
context "when the directory contains a csv export" do
before :each do
- FileUtils.touch("#{directory}/spreadsheet-stronglifts.csv")
+ file_path = "#{directory}/spreadsheet-stronglifts-csv20151114-1138"
+ FileUtils.touch(file_path)
end
it "returns true" do
@@ -32,7 +33,7 @@ describe Csv::Import do
end
before :each do
- `cp #{backup_file} #{directory}`
+ `cp #{backup_file} #{directory}/spreadsheet-stronglifts.csv#{rand}`
end
after :each do