From 8a504cad23b8055f2fd8bba28ba2682b6ef36f3d Mon Sep 17 00:00:00 2001
From: Sergey Karashevich <sergey.karashevich@jetbrains.com>
Date: Fri, 30 Sep 2016 16:05:41 +0300
Subject: [PATCH] gui-tests-framework: git configure added to GuiTestCase

---
 .../com/intellij/testGuiFramework/impl/GuiTestCase.java    | 7 +++++++
 platform/testGuiFramework/testGuiFramework.iml             | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.java b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.java
index c3eb876963c5..0cf6daa7c50b 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.java
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.java
@@ -15,9 +15,11 @@
  */
 package com.intellij.testGuiFramework.impl;
 
+import com.intellij.testFramework.vcs.ExecutableHelper;
 import com.intellij.testGuiFramework.framework.GuiTestBase;
 import com.intellij.testGuiFramework.framework.TestWithIde;
 import com.intellij.util.net.HttpConfigurable;
+import git4idea.config.GitVcsApplicationSettings;
 import org.fest.swing.core.FastRobot;
 
 import static com.intellij.testGuiFramework.framework.GuiTestUtil.setUpDefaultProjectCreationLocationPath;
@@ -42,6 +44,7 @@ public class GuiTestCase extends GuiTestBase {
 
     setIdeSettings();
     setUpSdks();
+    setPathToGit();
   }
 
   private static void setIdeSettings() {
@@ -52,4 +55,8 @@ public class GuiTestCase extends GuiTestBase {
     ideSettings.PROXY_PORT = 80;
   }
 
+  private static void setPathToGit() {
+    GitVcsApplicationSettings.getInstance().setPathToGit(ExecutableHelper.findGitExecutable());
+  }
+
 }
diff --git a/platform/testGuiFramework/testGuiFramework.iml b/platform/testGuiFramework/testGuiFramework.iml
index d5e56c719740..9dfed1885fac 100644
--- a/platform/testGuiFramework/testGuiFramework.iml
+++ b/platform/testGuiFramework/testGuiFramework.iml
@@ -32,6 +32,7 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="git4idea" scope="TEST" />
+    <orderEntry type="module" module-name="git4idea" />
+    <orderEntry type="module" module-name="vcs-tests" />
   </component>
 </module>
\ No newline at end of file