aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZog2018-02-20 10:12:17 +0100
committerZog2018-02-20 10:12:17 +0100
commitf77c01daa40cb389a8eacc8403bd3adb035e2930 (patch)
treeb3c9bff30bf218caeb50919bfe6162d84dcdd908
parent1a96585a165776174b4763bf8455d5dbe999e7ba (diff)
downloadchouette-core-f77c01daa40cb389a8eacc8403bd3adb035e2930.tar.bz2
Fix specs
-rw-r--r--app/models/simple_importer.rb2
-rw-r--r--spec/models/simple_importer_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/simple_importer.rb b/app/models/simple_importer.rb
index 36b31a997..b824d596d 100644
--- a/app/models/simple_importer.rb
+++ b/app/models/simple_importer.rb
@@ -256,7 +256,7 @@ class SimpleImporter < ActiveRecord::Base
msg = "#{"%#{@padding}d" % (@current_line + 1)}/#{@number_of_lines}: #{full_status}"
- lines_count = (@status_height / 2) - 3
+ lines_count = [(@status_height / 2) - 3, 1].max
if @messages.any?
msg += "\n\n"
diff --git a/spec/models/simple_importer_spec.rb b/spec/models/simple_importer_spec.rb
index 2f520a3f3..60d7b7882 100644
--- a/spec/models/simple_importer_spec.rb
+++ b/spec/models/simple_importer_spec.rb
@@ -101,7 +101,7 @@ RSpec.describe SimpleImporter do
end
it "should create the record" do
- expect{importer.import verbose: true}.to change{Chouette::StopArea.count}.by 1
+ expect{importer.import verbose: false}.to change{Chouette::StopArea.count}.by 1
expect(importer.status).to eq "success"
end
end
@@ -336,7 +336,7 @@ RSpec.describe SimpleImporter do
journey_pattern_count = Chouette::JourneyPattern.count
stop_areas_count = Chouette::StopArea.count
- expect{importer.import(verbose: true)}.to change{Chouette::StopPoint.count}.by 10
+ expect{importer.import(verbose: false)}.to change{Chouette::StopPoint.count}.by 10
expect(importer.status).to eq "success"
expect(Chouette::Route.count).to eq routes_count + 2
expect(Chouette::JourneyPattern.count).to eq journey_pattern_count + 2