Update tests

oxyc · oxyc · commit 8464e4ba1857 · 2016-06-04T10:17:08.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,6 @@ env:
       version: 7
       init: /usr/lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-      local_config: tests/centos-7-composerfile.config.yml
 
 services:
   - docker
diff --git a/tests/centos-7-composerfile.config.yml b/tests/centos-7-composerfile.config.yml
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
@@ -1,6 +1,6 @@
 ---
 drupalvm_webserver: nginx
 
-# Test drush makefile based installation.
-build_composer: false
-build_makefile: true
+# Test composer based installation.
+build_composer: true
+drupal_composer_path: "{{ config_dir }}/../tests/composer.json"
