Merge pull request #80 from datacite/bug_claims_pending

Bug claims pending
datacite · Oct 15, 2019 · f3c263c · f3c263c
2 parents 17ce4b9 + 00445af
commit f3c263c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/app/models/claim.rb b/app/models/claim.rb
@@ -186,7 +186,9 @@ def process_data(options={})
     logger = Logger.new(STDOUT)
 
     self.start
-    result = collect_data
+
+    ### depdency Injection for testing
+    result = options[:collect_data] || collect_data 
 
     if result.body["skip"]
       claimed_at.present? ? self.finish : self.skip
@@ -200,7 +202,7 @@ def process_data(options={})
 
       logger.error "[Error] #{self.uid} – #{self.doi}] " + result.body["errors"].first["title"].inspect
 
-      self.error
+      self.error!
     elsif result.body["notification"]
       write_attribute(:put_code, result.body["put_code"])
       write_attribute(:error_messages, nil)
@@ -223,7 +225,7 @@ def process_data(options={})
         logger.warn "[Deleted] #{self.uid} – #{self.doi}] with Put Code #{result.body["put_code"]}" 
       end
 
-      self.finish
+      self.finish!
     end
   end
 

diff --git a/spec/factories/default.rb b/spec/factories/default.rb
@@ -22,7 +22,7 @@
 
     factory :valid_user do
       uid { '0000-0001-6528-2027' }
-      orcid_token { ENV['ACCESS_TOKEN'] }
+      orcid_token { ENV['ORCID_TOKEN'] }
     end
 
     factory :invalid_user do

diff --git a/spec/models/claim_spec.rb b/spec/models/claim_spec.rb
@@ -76,6 +76,14 @@
       expect(subject.claimed_at).not_to be_blank
       expect(subject.state).to eq("done")
     end
+
+    it 'no errors with dependency injection' do
+      options = {collect_data: OpenStruct.new(body: { "put_code" => "1069294"})}
+      expect(subject.process_data(options)).to be true
+      expect(subject.put_code).to eq(put_code)
+      expect(subject.claimed_at).not_to be_blank
+      expect(subject.state).to eq("done")
+    end
 
     it 'already exists' do
       FactoryBot.create(:claim, user: user, orcid: "0000-0001-6528-2027", doi: "10.14454/j6gr-cf48", claim_action: "create", claimed_at: Time.zone.now, put_code: put_code)