Fix unit tests

.travis.yml

@@ -0,0 +1,10 @@
+language: objective-c
+notifications:
+  email: false
+osx_image: xcode7.1
+script: xctool -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=
+xcode_workspace: MMMarkdown.xcworkspace
+xcode_scheme:
+  - MMMarkdown (iOS)
+  - MMMarkdown (OS X)
+

Source/MMParser.m

@@ -526,7 +526,7 @@ - (NSArray *)_parseCodeLinesWithScanner:(MMScanner *)scanner
 - (MMElement *)_parseCodeBlockWithScanner:(MMScanner *)scanner
 {
     NSUInteger indentation = [scanner skipIndentationUpTo:4];
-    if (indentation != 4)
+    if (indentation != 4 || scanner.atEndOfLine)
         return nil;
 
     MMElement *element = [MMElement new];

Tests/MMBlockTests.m

@@ -100,6 +100,11 @@ - (void)testNestedBlockquote
 
 #pragma mark - Code Block Tests
 
+- (void)testCodeBlockWithNoCode
+{
+    MMAssertMarkdownEqualsHTML(@"    \nfoo\n", @"<p>foo</p>");
+}
+
 - (void)testCodeBlocks_blankLinesInBetween
 {
     NSString *markdown = @"    Some Code\n"

Tests/MMHTMLTests.m

@@ -226,9 +226,7 @@ - (void)testBlockHTMLWithUnclosedTag
 
 - (void)testBlockHTMLCommentWithSpans
 {
-    // An SGML comment starts and ends with "--", so you can't have an odd number of dashes before
-    // the closing angle bracket.
-    MMAssertMarkdownEqualsHTML(@"<!------> *hello*-->", @"<!------> *hello*-->");
+    MMAssertMarkdownEqualsString(@"<!------> *hello*-->", @"<!------><p><em>hello</em>--></p>\n");
 }
 
 

Tests/MMMarkdownTests.m

@@ -81,15 +81,25 @@ - (void)testInlineHTMLAdvanced
     [self runTestWithName:@"Inline HTML (Advanced)"];
 }
 
+#if 0
+/*
+ * This isn't valid XML, so we can't compare it.
+ */
 - (void)testInlineHTMLSimple
 {
     [self runTestWithName:@"Inline HTML (Simple)"];
 }
+#endif
 
+#if 0
+/*
+ * XML comments can't contain `--`, so there's not a good way to do this comparison.
+ */
 - (void)testInlineHTMLComments
 {
     [self runTestWithName:@"Inline HTML comments"];
 }
+#endif
 
 - (void)testLinksInlineStyle
 {

Tests/MMPHPMarkdownTests.m

@@ -97,20 +97,30 @@ - (void)testImagesUntitled
     [self runTestWithName:@"Images (Untitled)"];
 }
 
+#if 0
+/*
+ * This isn't valid XML, so we can't compare it.
+ */
 - (void)testInlineHTMLSimple
 {
     [self runTestWithName:@"Inline HTML (Simple)"];
 }
+#endif
 
 - (void)testInlineHTMLSpan
 {
     [self runTestWithName:@"Inline HTML (Span)"];
 }
 
+#if 0
+/*
+ * XML comments can't contain `--`, so there's not a good way to do this comparison.
+ */
 - (void)testInlineHTMLComments
 {
     [self runTestWithName:@"Inline HTML comments"];
 }
+#endif
 
 #if 0
 /*

Tests/MMTestCase.h

@@ -43,9 +43,12 @@
         output = [NSString stringWithFormat:@"<test>%@</test>", output]; \
         html2  = [NSString stringWithFormat:@"<test>%@</test>", html2]; \
         \
-        NSXMLDocument *actual   = [[NSXMLDocument alloc] initWithXMLString:output options:0 error:nil]; \
-        NSXMLDocument *expected = [[NSXMLDocument alloc] initWithXMLString:html2  options:0 error:nil]; \
-        XCTAssertNotNil(actual);\
+        NSError *actualError; \
+        NSError *expectedError; \
+        NSXMLDocument *actual   = [[NSXMLDocument alloc] initWithXMLString:output options:0 error:&actualError]; \
+        NSXMLDocument *expected = [[NSXMLDocument alloc] initWithXMLString:html2  options:0 error:&expectedError]; \
+        XCTAssertNotNil(actual, "%@", actualError); \
+        XCTAssertNotNil(expected, "%@", expectedError); \
         XCTAssertEqualObjects(actual, expected); \
     } while(0)
 
@@ -57,7 +60,8 @@
         NSError *error; \
         NSString *actual   = [MMMarkdown HTMLStringWithMarkdown:a1value error:&error]; \
         NSString *expected = a2value; \
-        XCTAssertNotNil(actual);\
+        XCTAssertNotNil(actual); \
+        XCTAssertNotNil(expected); \
         XCTAssertEqualObjects(actual, expected); \
     } while(0)