소스 검색

Update branch name in pull

Abdullah Almsaeed 7 년 전
부모
커밋
7d4317c332
5개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      .gitignore
  2. 2 1
      .travis.yml
  3. 3 3
      phpunit.xml
  4. 0 0
      tests/bootstrap.php
  5. 0 0
      tests/tripal_test.test

+ 1 - 1
.gitignore

@@ -1,4 +1,4 @@
 .DS_Store
 composer.lock
 vendor/*
-test/.env
+tests/.env

+ 2 - 1
.travis.yml

@@ -12,12 +12,13 @@ branches:
 
 before_script:
   - docker pull statonlab/drupal7
+  # Travis does a shallow clone of on
   - git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
-  - git pull
 
 script:
   # Set branch name
   - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
+  - git pull origin $BRANCH
   # Test tripal 3 installation
   - docker run -it -d --rm --name tripal3 -v "$(pwd)":/modules/tripal statonlab/drupal7
   - sleep 10

+ 3 - 3
phpunit.xml

@@ -1,12 +1,12 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="phpunit.xsd"
-         bootstrap="test/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
          verbose="true"
          colors="true">
     <testsuites>
         <testsuite name="default">
-            <directory suffix=".test">./test/</directory>
-            <exclude>test/bootstrap.php</exclude>
+            <directory suffix=".test">./tests/</directory>
+            <exclude>tests/bootstrap.php</exclude>
         </testsuite>
     </testsuites>
 </phpunit>

+ 0 - 0
test/bootstrap.php → tests/bootstrap.php


+ 0 - 0
test/tripal_test.test → tests/tripal_test.test