From 6226619c54317cdc72a2723ace35c21d9943767a Mon Sep 17 00:00:00 2001
From: miya0001 <miya@wpist.me>
Date: Sun, 10 Sep 2017 02:23:32 +0900
Subject: [PATCH 1/3] add --force to install theme

---
 provision/playbooks/wordpress.yml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/provision/playbooks/wordpress.yml b/provision/playbooks/wordpress.yml
index 4686336..529ed92 100644
--- a/provision/playbooks/wordpress.yml
+++ b/provision/playbooks/wordpress.yml
@@ -124,26 +124,11 @@
       --path={{ path }}
     when: vccw.lang == 'ja'
 
-  # Check exsist Theme
-  - name: Run `wp theme is-installed`
-    command: |
-      wp theme is-installed {{ vccw.theme }}
-      --path={{ path }}
-    register: theme_is_installed
-    ignore_errors: True
-    when: vccw.theme != ''
-
   # Install Theme
   - name: Run `wp theme install`
     command: |
       wp theme install {{ vccw.theme }}
-      --path={{ path }} --activate
-    when: vccw.theme != '' and theme_is_installed.rc == 1
-
-  - name: Run `wp theme activate`
-    command: |
-      wp theme activate {{ vccw.theme }}
-      --path={{ path }}
+      --path={{ path }} --activate --force
     when: vccw.theme != ''
 
   # Import Theme Unit Test Data

From 3bd566278286985427c33a46399b6257ca70b160 Mon Sep 17 00:00:00 2001
From: miya0001 <miya@wpist.me>
Date: Sun, 10 Sep 2017 02:25:58 +0900
Subject: [PATCH 2/3] skip tests for mailcatcher

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e9aa2c7..b6009ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ env:
   global:
   - VM_DIR=/vagrant
   matrix:
-  - VCCW_ENV='{ "ruby_gems":[], "wp_cli_packages":[] }'
-  - 'VCCW_ENV=''{ "ruby_gems":[], "wp_cli_packages":[], "lang": "ja", "plugins": [ "simple-map" ], "theme": "twentyfifteen"}'''
+  - VCCW_ENV='{ "ruby_gems":[], "wp_cli_packages":[], "mailcatcher":"false" }'
+  - 'VCCW_ENV=''{ "ruby_gems":[], "wp_cli_packages":[], "lang": "ja", "plugins": [ "simple-map" ], "theme": "twentyfifteen", "mailcatcher":"false" }'''
 before_install:
 - bundle install --path vendor/bundle
 - "/usr/bin/env bash bin/run-docker.sh"

From 2cc320a0758d9b52c62cdf7e399ad74b1f573441 Mon Sep 17 00:00:00 2001
From: miya0001 <miya@wpist.me>
Date: Sun, 10 Sep 2017 02:41:02 +0900
Subject: [PATCH 3/3] remove quotes from yaml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6009ef..1d44cac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ env:
   global:
   - VM_DIR=/vagrant
   matrix:
-  - VCCW_ENV='{ "ruby_gems":[], "wp_cli_packages":[], "mailcatcher":"false" }'
-  - 'VCCW_ENV=''{ "ruby_gems":[], "wp_cli_packages":[], "lang": "ja", "plugins": [ "simple-map" ], "theme": "twentyfifteen", "mailcatcher":"false" }'''
+  - VCCW_ENV='{ "ruby_gems":[], "wp_cli_packages":[], "mailcatcher":false }'
+  - 'VCCW_ENV=''{ "ruby_gems":[], "wp_cli_packages":[], "lang": "ja", "plugins": [ "simple-map" ], "theme": "twentyfifteen", "mailcatcher":false }'''
 before_install:
 - bundle install --path vendor/bundle
 - "/usr/bin/env bash bin/run-docker.sh"