From 3b7bffa2a1f7e66d37a8cc6abe274f8ed430e446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Oghin=C4=83?= <foghina@fb.com>
Date: Tue, 18 Aug 2015 11:48:49 +0100
Subject: [PATCH] [e2e] fix e2e tests

* use new _flowconfig in generator template
* increase sinopia max_body_size
* remove breaking `cd` command from e2e-test.sh
---
 local-cli/generator/templates/_flowconfig | 11 +++++------
 scripts/e2e-sinopia.config.yml            |  2 ++
 scripts/e2e-test.sh                       |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/local-cli/generator/templates/_flowconfig b/local-cli/generator/templates/_flowconfig
index 8989253d4..438e495d4 100644
--- a/local-cli/generator/templates/_flowconfig
+++ b/local-cli/generator/templates/_flowconfig
@@ -10,11 +10,8 @@
 # Ignore react-tools where there are overlaps, but don't ignore anything that
 # react-native relies on
 .*/node_modules/react-tools/src/React.js
-.*/node_modules/react-tools/src/renderers/shared/reconciler/ReactInstanceHandles.js
 .*/node_modules/react-tools/src/renderers/shared/event/EventPropagators.js
 .*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js
-.*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderSyntheticEvent.js
-.*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderTouchHistoryStore.js
 .*/node_modules/react-tools/src/shared/vendor/core/ExecutionEnvironment.js
 
 
@@ -35,13 +32,15 @@ node_modules/react-native/Libraries/react-native/react-native-interface.js
 [options]
 module.system=haste
 
+munge_underscores=true
+
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-3]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-3]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-4]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-4]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 [version]
-0.13.1
+0.14.0
diff --git a/scripts/e2e-sinopia.config.yml b/scripts/e2e-sinopia.config.yml
index 305e9ba2c..1739d0454 100644
--- a/scripts/e2e-sinopia.config.yml
+++ b/scripts/e2e-sinopia.config.yml
@@ -19,3 +19,5 @@ packages:
 
 logs:
   - {type: file, path: sinopia.log, format: pretty, level: http}
+
+max_body_size: '50mb'
diff --git a/scripts/e2e-test.sh b/scripts/e2e-test.sh
index ca20782ed..b105c4017 100755
--- a/scripts/e2e-test.sh
+++ b/scripts/e2e-test.sh
@@ -70,5 +70,4 @@ flow --retries 10
 
 node ../node_modules/react-native/packager/packager.js --nonPersistent &
 SERVER_PID=$!
-cd iOS
 xctool -scheme EndToEndTest -sdk iphonesimulator test