Moving test method for includes from git instead of having it on a se…

…parate class, as pointed by @jhedstrom
drush-ops · Dec 23, 2014 · 88498fe · 88498fe
1 parent c506f3c
commit 88498fe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 51 deletions.
diff --git a/tests/makeIncludesGitTest.php b/tests/makeIncludesGitTest.php
diff --git a/tests/makeTest.php b/tests/makeTest.php
@@ -118,6 +118,23 @@ function testMakeInclude() {
     $this->runMakefileTest('include');
   }
 
+  /**
+   * Test git support on includes directive
+   */
+  function testMakeIncludesGit() {
+    $config = $this->getMakefile('includes-git');
+    $options = array();
+    $makefile = $this->makefile_path . DIRECTORY_SEPARATOR . $config['makefile'];
+    $this->drush('make', array($makefile, UNISH_SANDBOX . '/test-build'), $options);
+
+    // Verify that core and example main module were downloaded
+    $this->assertFileExists(UNISH_SANDBOX . '/test-build/README.txt');
+    $this->assertFileExists(UNISH_SANDBOX . '/test-build/sites/all/modules/contrib/apachesolr/README.txt');
+
+    // Verify that module included in sub platform was downloaded
+    $this->assertFileExists(UNISH_SANDBOX . '/test-build/sites/all/modules/contrib/jquery_update/README.txt');
+  }
+
   function testMakeRecursion() {
     $this->runMakefileTest('recursion');
   }
@@ -494,6 +511,12 @@ function getMakefile($key) {
         'md5' => 'e2e230ec5eccaf5618050559ab11510d',
         'options'  => array(),
       ),
+      'includes-git' => array(
+        'name'     => 'Including makefiles from remote repositories',
+        'makefile' => 'includes-main.make',
+        'build'    => TRUE,
+        'options'  => array(),
+      ),
       'recursion' => array(
         'name'     => 'Recursion',
         'makefile' => 'recursion.make',