From 4decc08e53d0170f3b212502c2eb50f69edc2ee5 Mon Sep 17 00:00:00 2001
From: aleclarson <alec.stanford.larson@gmail.com>
Date: Mon, 19 Sep 2016 17:20:12 -0700
Subject: [PATCH] Revert test changes made in bb11639

---
 .../__tests__/ResponderEventPlugin-test.js    | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/renderers/shared/stack/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/renderers/shared/stack/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
index 35e797d2fd..a6dd2aa198 100644
--- a/src/renderers/shared/stack/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
+++ b/src/renderers/shared/stack/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
@@ -730,8 +730,8 @@ describe('ResponderEventPlugin', function() {
 
     // Parent is responder, and responder is transferred by a second touch start
     config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: true};
-    config.responderGrant.grandParent = {order: 1};
-    config.responderTerminationRequest.parent = {order: 2, returnVal: true};
+    config.responderTerminationRequest.parent = {order: 1, returnVal: true};
+    config.responderGrant.grandParent = {order: 2};
     config.responderTerminate.parent = {order: 3};
     config.responderStart.grandParent = {order: 4};
     run(config, three, startConfig(three.child, [three.child, three.child], [1]));
@@ -899,11 +899,10 @@ describe('ResponderEventPlugin', function() {
     config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
     config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
     config.moveShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
-    config.responderGrant.parent = {order: 3};
-    config.responderTerminationRequest.child = {order: 4, returnVal: false};
-    config.responderReject.parent = {order: 5};
+    config.responderTerminationRequest.child = {order: 3, returnVal: false};
+    config.responderReject.parent = {order: 4};
     // The start/move should occur on the original responder if new one is rejected
-    config.responderMove.child = {order: 6};
+    config.responderMove.child = {order: 5};
 
     var touchConfig =
       moveConfig(three.child, [three.child], [0]);
@@ -914,11 +913,10 @@ describe('ResponderEventPlugin', function() {
     config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
     config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
     config.startShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
-    config.responderGrant.parent = {order: 3};
-    config.responderTerminationRequest.child = {order: 4, returnVal: false};
-    config.responderReject.parent = {order: 5};
+    config.responderTerminationRequest.child = {order: 3, returnVal: false};
+    config.responderReject.parent = {order: 4};
     // The start/move should occur on the original responder if new one is rejected
-    config.responderStart.child = {order: 6};
+    config.responderStart.child = {order: 5};
 
     touchConfig =
       startConfig(three.child, [three.child, three.child], [1]);
@@ -948,9 +946,8 @@ describe('ResponderEventPlugin', function() {
     config.scrollShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
     config.scrollShouldSetResponder.captured.parent = {order: 1, returnVal: false};
     config.scrollShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
-    config.responderGrant.parent = {order: 3};
-    config.responderTerminationRequest.child = {order: 4, returnVal: false};
-    config.responderReject.parent = {order: 5};
+    config.responderTerminationRequest.child = {order: 3, returnVal: false};
+    config.responderReject.parent = {order: 4};
 
     run(config, three, {
       topLevelType: topLevelTypes.topScroll,
@@ -965,8 +962,8 @@ describe('ResponderEventPlugin', function() {
     config.scrollShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
     config.scrollShouldSetResponder.captured.parent = {order: 1, returnVal: false};
     config.scrollShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
-    config.responderGrant.parent = {order: 3};
-    config.responderTerminationRequest.child = {order: 4, returnVal: true};
+    config.responderTerminationRequest.child = {order: 3, returnVal: true};
+    config.responderGrant.parent = {order: 4};
     config.responderTerminate.child = {order: 5};
 
     run(config, three, {