Merge pull request #6 from mobile-devices/topic/sd-fix_test_helper_in…

…ject_to_cloud Topic/sd fix test helper inject to cloud
mobile-devices · Aug 9, 2016 · 100d174 · 100d174
2 parents cccc28f + 7aaf8dc
commit 100d174
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/user_api/com/mdi/dialog/cloud_gate.rb b/user_api/com/mdi/dialog/cloud_gate.rb
@@ -172,13 +172,13 @@ def inject_message(msg, channel, origin_channel = default_origin_channel)
               # todo: put some limitation
               user_api.mdi.tools.log.info("Pushing message #{inject_hash}")
               CC.push(inject_hash,'messages')
+              if RAGENT.running_env_name == 'sdk-vm'
+                TestsHelper.message_injected(user_api.mdi.dialog.create_new_message(inject_hash))
+              end
             end
 
             # success !
             PUNK.end('injectmsg','ok','out',"SERVER <- SERVER MSG[#{crop_ref(out_id,4)}]")
-            if RAGENT.running_env_name == 'sdk-vm'
-              TestsHelper.message_injected(user_api.mdi.dialog.create_new_message(inject_hash))
-            end
 
             SDK_STATS.stats['agents'][user_api.user_class.agent_name]['inject_to_cloud'] += 1
             SDK_STATS.stats['agents'][user_api.user_class.agent_name]['total_sent'] += 1
@@ -220,12 +220,12 @@ def inject_track(track)
             sent = track.to_hash_to_send_to_cloud
             user_api.mdi.tools.log.info("Pushing track #{sent}")
             CC.push(sent,'tracks')
+            if RAGENT.running_env_name == 'sdk-vm'
+              TestsHelper.track_injected(user_api.mdi.dialog.create_new_track(sent))
+            end
 
             # success !
             PUNK.end('injecttrack','ok','out',"SERVER <- SERVER TRACK")
-            if RAGENT.running_env_name == 'sdk-vm'
-              TestsHelper.track_injected(user_api.mdi.dialog.create_new_message(track))
-            end
 
             SDK_STATS.stats['agents'][user_api.user_class.agent_name]['inject_to_cloud'] += 1
             return sent['payload']['id']

diff --git a/user_api/com/mdi/dialog/order.rb b/user_api/com/mdi/dialog/order.rb
@@ -52,7 +52,7 @@ def user_api
         def to_hash
           r_hash = {}
           r_hash['agent'] = self.agent
-          r_hash['order'] = self.order
+          r_hash['code'] = self.code
           r_hash['params'] = self.params
           r_hash.delete_if { |k, v| v.nil? }
         end