Fix the regular expression and unit test

satoshi-takano · satoshi-takano · commit 907891fc6647 · 2018-09-29T15:01:51.000+09:00
diff --git a/OpenGraph/OpenGraphParser.swift b/OpenGraph/OpenGraphParser.swift
@@ -24,7 +24,7 @@ extension OpenGraphParser {
             options: []
         )
         let contentRegexp = try! NSRegularExpression(
-            pattern: "\\scontent=(?:\"|\')(.*?)(?:\"|\')",
+            pattern: "\\scontent=(?:\"|\')(.*?)(?:\"|\')(?:\\s|>)",
             options: []
         )
         
diff --git a/Tests/OpenGraphTests.swift b/Tests/OpenGraphTests.swift
@@ -40,7 +40,7 @@ class OpenGraphTests: XCTestCase {
         }
         
         waitForExpectations(timeout: 10) { _ in
-            XCTAssert(og[.title] == " < example.com title > ")
+            XCTAssert(og[.title] == " < It's example.com title > ")
             XCTAssert(og[.type] == "website")
             XCTAssert(og[.url] == "https://www.example.com")
             XCTAssert(og[.image] == "https://www.example.com/images/example.png")
@@ -64,7 +64,7 @@ class OpenGraphTests: XCTestCase {
         }
         
         waitForExpectations(timeout: 10) { _ in
-            XCTAssert(og[.title] == " < example.com title > ")
+            XCTAssert(og[.title] == " < It's example.com title > ")
             XCTAssert(og[.type] == "website")
             XCTAssert(og[.url] == "https://www.example.com")
             XCTAssert(og[.image] == "https://www.example.com/images/example.png")
diff --git a/Tests/ogp.html b/Tests/ogp.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta charset='utf-8'>
-    <meta property="og:title" content=" < example.com title > "><meta property="og:type" content="website" />
+    <meta property="og:title" content=" < It's example.com title > "><meta property="og:type" content="website" />
     <meta property="og:url" content="https://www.example.com" />
     
     <!-- og property that has an other attributes. -->

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ extension OpenGraphParser {`
`24`	`24`	`options: []`
`25`	`25`	`)`
`26`	`26`	`let contentRegexp = try! NSRegularExpression(`
`27`		`- pattern: "\\scontent=(?:\"\|\')(.*?)(?:\"\|\')",`
	`27`	`+ pattern: "\\scontent=(?:\"\|\')(.*?)(?:\"\|\')(?:\\s\|>)",`
`28`	`28`	`options: []`
`29`	`29`	`)`
`30`	`30`