From 70bcac9273a9b94dbd8a4393a26706e617e594c2 Mon Sep 17 00:00:00 2001
From: azu <azuciao@gmail.com>
Date: Fri, 13 Jun 2014 08:23:36 +0900
Subject: [PATCH] =?UTF-8?q?fix(inline-script-tester):=20include=E3=83=9E?=
 =?UTF-8?q?=E3=82=AF=E3=83=AD=E3=81=A8=E3=82=A4=E3=83=B3=E3=83=A9=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE=E7=B5=84=E3=81=BF?=
 =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=81=AB=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

実行マークのために組みわせて書くケースが出来てきたため
---
 test/inline-script/inline-script-tester.js   | 14 ++++++++++++--
 test/inline-script/run-inline-script-test.js |  4 +++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/test/inline-script/inline-script-tester.js b/test/inline-script/inline-script-tester.js
index 0015a80ec..a72c3ab80 100644
--- a/test/inline-script/inline-script-tester.js
+++ b/test/inline-script/inline-script-tester.js
@@ -4,14 +4,24 @@ var FS = require("q-io/fs");
 var esprima = require("esprima-fb");
 var pather = require("path");
 // http://www.regexr.com/38t47
-var inlineCodeReg = /\[source.*?js\]\n[\s\S]*?----([\s\S]*?)----/gm;
+var inlineCodeReg = /\[source.*?javascript\]\n[\s\S]*?----([\s\S]*?)----/gm;
 var includeCodeReg = /include::/;
+function trimIncludeCode(code) {
+    var replaceRegExp = /include::.*/g;
+    var trimedCode = code.replace(replaceRegExp, "");
+    return trimedCode.trim();
+}
 function pickupContent(content) {
     var results = [];
     var matches;
     while ((matches = inlineCodeReg.exec(content)) !== null) {
         var code = matches[1];
-        if (!includeCodeReg.test(code)) {
+        if (includeCodeReg.test(code)) {
+            var trimedCode = trimIncludeCode(code);
+            if (trimedCode.length > 0) {
+                results.push(trimedCode);
+            }
+        } else {
             results.push(code);
         }
     }
diff --git a/test/inline-script/run-inline-script-test.js b/test/inline-script/run-inline-script-test.js
index d09535dec..6c70a1619 100644
--- a/test/inline-script/run-inline-script-test.js
+++ b/test/inline-script/run-inline-script-test.js
@@ -5,5 +5,7 @@
 "use strict";
 var checkInlineScript = require("./inline-script-tester").checkInlineScript;
 checkInlineScript("../../").catch(function (error) {
-//    console.log(error);
+    if(error) {
+        console.error(error);
+    }
 });
\ No newline at end of file