From 571df5f44bfec89b21bdce0f91f9acfdda6d7660 Mon Sep 17 00:00:00 2001
From: Mike Wyatt <wyatt.mike@gmail.com>
Date: Thu, 31 Dec 2015 18:29:00 -0400
Subject: [PATCH] Use `execute` in Asana specs

---
 .../project_services/asana_service_spec.rb    | 61 ++++++++++---------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/spec/models/project_services/asana_service_spec.rb b/spec/models/project_services/asana_service_spec.rb
index a7b32ac07a9..0db48c75d1d 100644
--- a/spec/models/project_services/asana_service_spec.rb
+++ b/spec/models/project_services/asana_service_spec.rb
@@ -76,53 +76,56 @@ describe AsanaService, models: true do
       @asana.execute(data)
     end
 
-    it 'should call Asana service to created a story and close a task' do
-      d1 = double('Asana::Task', add_comment: true)
+    it 'should call Asana service to create a story and close a task' do
+      data = create_data_for_commits('fix #456789')
+      d1 = double('Asana::Task')
       expect(d1).to receive(:add_comment)
       expect(d1).to receive(:update).with(completed: true)
       expect(Asana::Task).to receive(:find_by_id).with(anything, '456789').once.and_return(d1)
 
-      @asana.check_commit('fix #456789', 'pushed')
+      @asana.execute(data)
     end
 
     it 'should be able to close via url' do
-      d1 = double('Asana::Task', add_comment: true)
+      data = create_data_for_commits('closes https://app.asana.com/19292/956299/42')
+      d1 = double('Asana::Task')
       expect(d1).to receive(:add_comment)
       expect(d1).to receive(:update).with(completed: true)
       expect(Asana::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d1)
 
-      @asana.check_commit('closes https://app.asana.com/19292/956299/42', 'pushed')
+      @asana.execute(data)
     end
 
     it 'should allow multiple matches per line' do
-      d1 = double('Asana::Task', add_comment: true)
-      expect(d1).to receive(:add_comment)
-      expect(d1).to receive(:update).with(completed: true)
-      expect(Asana::Task).to receive(:find_by_id).with(anything, '123').once.and_return(d1)
-
-      d2 = double('Asana::Task', add_comment: true)
-      expect(d2).to receive(:add_comment)
-      expect(d2).to receive(:update).with(completed: true)
-      expect(Asana::Task).to receive(:find_by_id).with(anything, '456').once.and_return(d2)
-
-      d3 = double('Asana::Task', add_comment: true)
-      expect(d3).to receive(:add_comment)
-      expect(Asana::Task).to receive(:find_by_id).with(anything, '789').once.and_return(d3)
-
-      d4 = double('Asana::Task', add_comment: true)
-      expect(d4).to receive(:add_comment)
-      expect(Asana::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d4)
-
-      d5 = double('Asana::Task', add_comment: true)
-      expect(d5).to receive(:add_comment)
-      expect(d5).to receive(:update).with(completed: true)
-      expect(Asana::Task).to receive(:find_by_id).with(anything, '12').once.and_return(d5)
-
       message = <<-EOF
       minor bigfix, refactoring, fixed #123 and Closes #456 work on #789
       ref https://app.asana.com/19292/956299/42 and closing https://app.asana.com/19292/956299/12
       EOF
-      @asana.check_commit(message, 'pushed')
+      data = create_data_for_commits(message)
+      d1 = double('Asana::Task')
+      expect(d1).to receive(:add_comment)
+      expect(d1).to receive(:update).with(completed: true)
+      expect(Asana::Task).to receive(:find_by_id).with(anything, '123').once.and_return(d1)
+
+      d2 = double('Asana::Task')
+      expect(d2).to receive(:add_comment)
+      expect(d2).to receive(:update).with(completed: true)
+      expect(Asana::Task).to receive(:find_by_id).with(anything, '456').once.and_return(d2)
+
+      d3 = double('Asana::Task')
+      expect(d3).to receive(:add_comment)
+      expect(Asana::Task).to receive(:find_by_id).with(anything, '789').once.and_return(d3)
+
+      d4 = double('Asana::Task')
+      expect(d4).to receive(:add_comment)
+      expect(Asana::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d4)
+
+      d5 = double('Asana::Task')
+      expect(d5).to receive(:add_comment)
+      expect(d5).to receive(:update).with(completed: true)
+      expect(Asana::Task).to receive(:find_by_id).with(anything, '12').once.and_return(d5)
+
+      @asana.execute(data)
     end
   end
 end