From d9011580a155e784c1b45b7cdf4d05d918a8c1dd Mon Sep 17 00:00:00 2001 From: Patrick Davey Date: Fri, 24 Aug 2012 15:30:22 +1200 Subject: [PATCH] add TaxonNameAdapter tests passing. --- vendor/plugins/ratatosk/lib/ratatosk/name_providers/nzor.rb | 4 ++-- vendor/plugins/ratatosk/spec/nzor_provider_spec.rb | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/vendor/plugins/ratatosk/lib/ratatosk/name_providers/nzor.rb b/vendor/plugins/ratatosk/lib/ratatosk/name_providers/nzor.rb index 22a3bd56e69..ca68c4e8013 100644 --- a/vendor/plugins/ratatosk/lib/ratatosk/name_providers/nzor.rb +++ b/vendor/plugins/ratatosk/lib/ratatosk/name_providers/nzor.rb @@ -44,7 +44,7 @@ class NZORTaxonNameAdapter def initialize(hxml, params = {}) @adaptee = TaxonName.new(params) @hxml = hxml - taxon_name.name = @hxml.at('FullName').inner_text + taxon_name.name = @hxml.at('AcceptedName/PartialName').inner_text taxon_name.lexicon = get_lexicon taxon_name.is_valid = get_is_valid taxon_name.source = Source.find_by_title('New Zealand Organisms Register') @@ -135,7 +135,7 @@ class NZORTaxonAdapter def initialize(hxml, params = {}) @adaptee = Taxon.new(params) @hxml = hxml - @adaptee.name = @hxml.at('FullName').inner_text + @adaptee.name = @hxml.at('AcceptedName/PartialName').inner_text @adaptee.rank = @hxml.at('Rank').inner_text.downcase @adaptee.source = Source.find_by_title('New Zealand Organisms Register') @adaptee.source_identifier = @hxml.at('NameId').inner_text diff --git a/vendor/plugins/ratatosk/spec/nzor_provider_spec.rb b/vendor/plugins/ratatosk/spec/nzor_provider_spec.rb index 708db1450dd..7823cb4bd5b 100644 --- a/vendor/plugins/ratatosk/spec/nzor_provider_spec.rb +++ b/vendor/plugins/ratatosk/spec/nzor_provider_spec.rb @@ -122,19 +122,16 @@ end it "should have a working #to_json method" do - pending lambda { @adapter.to_json }.should_not raise_error end it "should only have one scientific name after saving" do - pending @adapter.save @adapter.reload @adapter.taxon_names.select{|n| n.name == @adapter.name}.size.should be(1) end it "should have a unique name after saving" do - pending @adapter.save @adapter.reload @adapter.unique_name.should_not be_nil