From 0704aae88be9464b1262d393f59dcec79adb0a00 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Mon, 12 Aug 2019 06:04:05 +0900
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20test:=20UnitTest=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20https://github.com/researchmap/RmNetCommons3/issues/1468?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Fixture/FramesLanguage4iframesFixture.php | 80 +++++++++++++++++++
 TestSuite/IframesControllerTestCase.php       |  1 +
 2 files changed, 81 insertions(+)
 create mode 100644 Test/Fixture/FramesLanguage4iframesFixture.php

diff --git a/Test/Fixture/FramesLanguage4iframesFixture.php b/Test/Fixture/FramesLanguage4iframesFixture.php
new file mode 100644
index 0000000..d8a34cd
--- /dev/null
+++ b/Test/Fixture/FramesLanguage4iframesFixture.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * FramesLanguageFixture
+ *
+ * @author Shohei Nakajima <nakajimashouhei@gmail.com>
+ * @link http://www.netcommons.org NetCommons Project
+ * @license http://www.netcommons.org/license.txt NetCommons License
+ * @copyright Copyright 2014, NetCommons Project
+ */
+
+App::uses('FramesLanguageFixture', 'Frames.Test/Fixture');
+
+/**
+ * FramesLanguageFixture
+ *
+ * @author Shohei Nakajima <nakajimashouhei@gmail.com>
+ * @package NetCommons\Blocks\Test\Fixture
+ */
+class FramesLanguage4iframesFixture extends FramesLanguageFixture {
+
+/**
+ * Model name
+ *
+ * @var string
+ */
+	public $name = 'FramesLanguage';
+
+/**
+ * Full Table Name
+ *
+ * @var string
+ */
+	public $table = 'frames_languages';
+
+/**
+ * Records
+ *
+ * @var array
+ */
+	public $records = array(
+		//メイン
+		array(
+			'id' => '6',
+			'language_id' => '2',
+			'frame_id' => '6',
+			'name' => 'Test frame main',
+			'is_origin' => true,
+			'is_translation' => false,
+			'is_original_copy' => false,
+		),
+		array(
+			'id' => '7',
+			'language_id' => '2',
+			'frame_id' => '7',
+			'name' => 'Test frame main',
+			'is_origin' => true,
+			'is_translation' => false,
+			'is_original_copy' => false,
+		),
+		array(
+			'id' => '8',
+			'language_id' => '2',
+			'frame_id' => '8',
+			'name' => 'Test frame main',
+			'is_origin' => true,
+			'is_translation' => false,
+			'is_original_copy' => false,
+		),
+	);
+
+/**
+ * Initialize the fixture.
+ *
+ * @return void
+ */
+	public function init() {
+		parent::init();
+	}
+
+}
diff --git a/TestSuite/IframesControllerTestCase.php b/TestSuite/IframesControllerTestCase.php
index ce8cb31..1dbc9fb 100644
--- a/TestSuite/IframesControllerTestCase.php
+++ b/TestSuite/IframesControllerTestCase.php
@@ -32,6 +32,7 @@ abstract class IframesControllerTestCase extends NetCommonsControllerTestCase {
 		'plugin.iframes.iframe_frame_setting',
 		'plugin.iframes.frame4iframes',
 		'plugin.iframes.frame_public_language4iframes',
+		'plugin.iframes.frames_language4iframes',
 	);
 
 /**

From e094488ed5c599cef4936f47ece2d3bf4c1a8b1f Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Mon, 12 Aug 2019 06:05:02 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20test:=20travis=20php7.2=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=20https://github.com/NetCommons3/NetCommons3/issues/1?=
 =?UTF-8?q?451?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml      | 1 +
 phpunit.xml.dist | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e1c16ba..b6354ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 env:
   matrix:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 905482c..2b51739 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,6 +14,5 @@
     </filter>
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="coverage-html" target="build/logs/clover"/>
     </logging>
 </phpunit>

From 4dbb2c9bbc9f89ab4c91f80e382eacc615d73806 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Mon, 12 Aug 2019 06:09:29 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20test:=20travis=20php7.2=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=20https://github.com/NetCommons3/NetCommons3/issues/1?=
 =?UTF-8?q?451?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b6354ce..4388889 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ php:
   - 7.1
   - 7.2
 
+sudo: false
+dist: trusty
+
 env:
   matrix:
     - NETCOMMONS_VERSION=master DB=mysql