lib/amp_html/test.rb in amp-html-0.7.7 vs lib/amp_html/test.rb in amp-html-0.7.8

- old
+ new

@@ -103,15 +103,15 @@ end def self.markup_test results if results.present? - puts check1 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'meta_viewport.md') unless results.has_value? '<meta name="viewport" content="width=device-width,minimum-scale=1' - puts check2 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'head_body.md') unless results.has_value?('<head') || results.has_value? '<body' - puts check3 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'amp_html_doctype.md') unless results.has_value? 'amp_html_doctype' - puts check4 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'canonical_document_link.md') unless results.has_value? 'canonical_document_link' - puts check5 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'amp_head.md') unless results.has_value? 'amp_head' + puts check1 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'meta_viewport.md') unless results.has_value?('<meta name="viewport" content="width=device-width,minimum-scale=1') + puts check2 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'head_body.md') unless results.has_value?('<head') || results.has_value?('<body') + puts check3 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'amp_html_doctype.md') unless results.has_value?('amp_html_doctype') + puts check4 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'canonical_document_link.md') unless results.has_value?('canonical_document_link') + puts check5 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'amp_head.md') unless results.has_value?('amp_head') puts check6 = IO.read(File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'markup', 'canonical_document_link.md') if AmpHtml.split_view && results.has_value?('amp_document_link') == false end unless check1 && check2 && check3 && check4 && check5 && check6 return true end @@ -155,10 +155,10 @@ else puts IO.read File.join AmpHtml.root, 'amp_html', 'test', 'templates', 'css', "#{string}.md" puts source end end - return true if results.keys.size == 1 && results[results.keys.first] == '-amp-' && results.keys.first.include? 'application/amp/_resources.html' + return true if results.keys.size == 1 && results[results.keys.first] == '-amp-' && results.keys.first.include?('application/amp/_resources.html') else return true end return nil