diff options
| author | Zog | 2018-03-06 11:49:11 +0100 | 
|---|---|---|
| committer | Zog | 2018-03-06 11:49:19 +0100 | 
| commit | b7079226c965e7130a2bcc17b7f278a1e23ac7e8 (patch) | |
| tree | c3ed4a84b879d0424c6f269eb9f7aa2a2018f4fe | |
| parent | c322f76744e68185766b0962066d69f7dc4d9629 (diff) | |
| download | chouette-core-b7079226c965e7130a2bcc17b7f278a1e23ac7e8.tar.bz2 | |
Refs #6068; Fix specs6068-simple-exporter
| -rw-r--r-- | app/models/simple_exporter.rb | 1 | ||||
| -rw-r--r-- | app/models/simple_interface.rb | 1 | ||||
| -rw-r--r-- | app/models/simple_interfaces_group.rb | 3 | ||||
| -rw-r--r-- | spec/models/simple_interfaces_group_spec.rb | 10 | 
4 files changed, 8 insertions, 7 deletions
| diff --git a/app/models/simple_exporter.rb b/app/models/simple_exporter.rb index 93a773430..c267b5b8c 100644 --- a/app/models/simple_exporter.rb +++ b/app/models/simple_exporter.rb @@ -41,7 +41,6 @@ class SimpleExporter < SimpleInterface    protected    def init_env opts      @number_of_lines = collection.size -      super opts    end diff --git a/app/models/simple_interface.rb b/app/models/simple_interface.rb index 5997a6dd3..16d6e86f2 100644 --- a/app/models/simple_interface.rb +++ b/app/models/simple_interface.rb @@ -70,6 +70,7 @@ class SimpleInterface < ActiveRecord::Base      msg = colorize msg, opts[:color] if opts[:color]      @start_time ||= Time.now      time = Time.now - @start_time +    @messages ||= []      if opts[:append]        _time, _msg = @messages.pop || []        _time ||= time diff --git a/app/models/simple_interfaces_group.rb b/app/models/simple_interfaces_group.rb index b89a1b696..808be6570 100644 --- a/app/models/simple_interfaces_group.rb +++ b/app/models/simple_interfaces_group.rb @@ -15,7 +15,7 @@ class SimpleInterfacesGroup      @interfaces.each do |interface_def|        interface = interface_def[:interface]        interface.interfaces_group = self -      interface.send interface_def[:action], interface_def[:opts].reverse_update(shared_options) +      interface.send interface_def[:action], interface_def[:opts].reverse_update(shared_options || {})        return if interface.status == :error        @current_step += 1      end @@ -25,6 +25,7 @@ class SimpleInterfacesGroup    def banner width=nil      width ||= @width +    width ||= 128      @width = width      name = "### #{self.name} ###" diff --git a/spec/models/simple_interfaces_group_spec.rb b/spec/models/simple_interfaces_group_spec.rb index 65ce9a1bf..0b6d360de 100644 --- a/spec/models/simple_interfaces_group_spec.rb +++ b/spec/models/simple_interfaces_group_spec.rb @@ -3,13 +3,13 @@ RSpec.describe SimpleInterfacesGroup do      before do        create :stop_area        SimpleExporter.define :test_1 do |config| -        config.collection = Chouette::StopArea +        config.collection = Chouette::StopArea.all          config.key = "name"          config.add_column :name        end        SimpleExporter.define :test_2 do |config| -        config.collection = Chouette::StopArea +        config.collection = Chouette::StopArea.all          config.key = "name"          config.add_column :lat, attribute: :latitude        end @@ -19,12 +19,12 @@ RSpec.describe SimpleInterfacesGroup do        test_1 = SimpleExporter.new(configuration_name: :test_1, filepath: "tmp/test1.csv")        test_2 = SimpleExporter.new(configuration_name: :test_2, filepath: "tmp/test1.csv") -      expect(test_1).to receive(:export) -      expect(test_2).to receive(:export) +      expect(test_1).to receive(:export).and_call_original +      expect(test_2).to receive(:export).and_call_original        group = SimpleInterfacesGroup.new "group"        group.add_interface test_1, "Test 1", :export -      group.add_interface test_2, "Test 1", :export +      group.add_interface test_2, "Test 2", :export        group.run      end    end | 
