inkcite 1.14.0 → 1.15.0

data/lib/inkcite/view/context.rb

@@ -5,42 +5,12 @@ module Inkcite
     # engine without exposing all of the view's attributes.
     class Context
 
-      delegate :browser?, :development?, :email?, :environment, :format, :production?, :preview?, :version, :to => :view
+      delegate :browser?, :development?, :email?, :environment, :format, :helper, :once?, :production?, :preview?, :version, :to => :view
 
       def initialize view
         @view = view
       end
 
-      # Defines a new helper via ERB, which allows designers to keep helper
-      # markup alongside the usage of it inside of partial.  Helps keep
-      # code clean and prevents helper.tsv pollution for one-offs
-      def helper tag, open, close=nil
-
-        tag = tag.to_sym
-
-        # The config object holds the defined helpers
-        config = @view.config
-
-        # Warn the user if the helper is already defined.
-        view.error("Helper '#{tag}' already defined", :open => open, :close => close) unless config[tag].nil?
-
-        config[tag] = open.to_s
-        config[:"/#{tag}"] = close.to_s
-
-      end
-
-      def once? key
-
-        # Initialize the 'once' data hash which maps
-        @view.data[:once] ||= {}
-
-        # True if this is the first time we've encountered this key.
-        first_time = @view.data[:once][key].nil?
-        @view.data[:once][key] = true if first_time
-
-        first_time
-      end
-
       def method_missing(m, *args, &block)
         if m[-1] == QUESTION_MARK
           start_at = m[0] == UNDERSCORE ? 1 : 0

data/lib/inkcite/view/media_query.rb

@@ -45,6 +45,12 @@ module Inkcite
 
         css = []
         css << "@media only screen and (max-width: #{Inkcite::Renderer::px(@max_width)}) {"
+
+        # Remove extraneous right-margin on Gmail by applying this to the
+        # body via a class selector.
+        # https://litmus.com/community/discussions/5913-new-gmail-app-not-respect-full-width
+        css << 'u + .body { min-width: 100vw; }'
+
         css += active_styles.collect(&:to_css)
         css << '}'
 

data/test/animation_spec.rb

@@ -48,6 +48,13 @@ describe Inkcite::Animation do
     keyframe.to_css('').must_equal('25%, 40.9% { top:-15% }')
   end
 
+  it 'supports keyframe end percent' do
+    keyframe = Inkcite::Animation::Keyframe.new(38.3, @view)
+    keyframe.end_percent = 42.3
+    keyframe[:top] = '-15%'
+    keyframe.to_css('').must_equal('38.3%, 42.3% { top:-15% }')
+  end
+
   it 'reports when an animation is blank' do
     anim = Inkcite::Animation.new('snowflake7', @view)
     anim.blank?.must_equal(true)

data/test/parser_spec.rb

@@ -70,7 +70,7 @@ describe Inkcite::Parser do
       Inkcite::Parser.each('{ok}') { |e| '{ok}' }
       false.must_equal(true) # Intentional, should never be thrown.
     rescue Exception => e
-      e.message.must_equal("Infinite replacement detected: 1000 {ok}")
+      e.message.must_equal('Infinite replacement detected: 1000 {ok}')
     end
   end
 

data/test/renderer/background_spec.rb

@@ -6,53 +6,57 @@ describe Inkcite::Renderer::Background do
 
   it 'warns when an image is missing' do
     Inkcite::Renderer.render('{background src=missing.jpg}', @view)
-    @view.errors.must_include('Missing image (line 0) [src=missing.jpg]')
+    assert_error @view, 'Missing image', 'src=missing.jpg'
   end
 
   it 'warns when an outlook-specific image is missing' do
     Inkcite::Renderer.render('{background outlook-src=also-missing.jpg}', @view)
-    @view.errors.must_include('Missing image (line 0) [src=also-missing.jpg]')
+    assert_error @view, 'Missing image', 'src=also-missing.jpg'
   end
 
   it 'defaults to filling the available horizontal space' do
-    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
   end
 
   it 'supports 100% width' do
-    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png width=100%}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png width=100%}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
   end
 
   it 'supports fill width' do
-    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png width=fill}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png width=fill}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
   end
 
   it 'supports an optional width in pixels' do
-    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png width=120}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=120><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="width:120px" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png width=120}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=120><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="width:120px" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
   end
 
   it 'supports an optional height in pixels' do
-    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png bgcolor=#7bceeb height=92 width=120}{/background}', @view).must_equal('<table bgcolor=#7bceeb border=0 cellpadding=0 cellspacing=0 height=92 style="background:#7bceeb url(https://i.imgur.com/YJOX1PC.png)" width=120><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="height:92px;width:120px" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill color="#7bceeb" src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0"><![endif]--><div></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png bgcolor=#7bceeb height=92 width=120}{/background}', @view).must_equal('<table bgcolor=#7bceeb border=0 cellpadding=0 cellspacing=0 style="background:#7bceeb url(https://i.imgur.com/YJOX1PC.png)" width=120><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="height:92px;width:120px" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill color="#7bceeb" src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td height=92></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
   end
 
   it 'supports an optional background color' do
-    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png bgcolor=#7bceeb width=120}{/background}', @view).must_equal('<table bgcolor=#7bceeb border=0 cellpadding=0 cellspacing=0 style="background:#7bceeb url(https://i.imgur.com/YJOX1PC.png)" width=120><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="width:120px" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill color="#7bceeb" src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png bgcolor=#7bceeb width=120}{/background}', @view).must_equal('<table bgcolor=#7bceeb border=0 cellpadding=0 cellspacing=0 style="background:#7bceeb url(https://i.imgur.com/YJOX1PC.png)" width=120><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="width:120px" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill color="#7bceeb" src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
   end
 
   it 'supports the font attribute' do
-    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png font=large align=center}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div style="color:#ff0000;font-family:serif;font-size:24px;font-weight:bold;line-height:24px;text-align:center"></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png font=large align=center}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td align=center style="color:#ff0000;font-family:serif;font-size:24px;font-weight:bold;line-height:24px"></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
   end
 
   it 'supports font-related attributes' do
-    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png font-size=18 line-height=27}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div style="font-size:18px;line-height:27px"></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png font-size=18 line-height=27}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td style="font-size:18px;line-height:27px"></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
   end
 
   it 'supports a custom mobile background' do
-    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png mobile-src="https://i.imgur.com/YJOX1PC-mobile.png" mobile-background-position="top" mobile-background-size="cover"}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 class="m1" style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=https://i.imgur.com/YJOX1PC.png mobile-src="https://i.imgur.com/YJOX1PC-mobile.png" mobile-background-position="top" mobile-background-size="cover"}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 class="m1" style="background:url(https://i.imgur.com/YJOX1PC.png)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="https://i.imgur.com/YJOX1PC.png" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
     @view.media_query.find_by_klass('m1').declaration_string.must_equal('background:url(https://i.imgur.com/YJOX1PC-mobile.png) top / cover no-repeat !important')
   end
 
+  it 'supports padding' do
+    Inkcite::Renderer.render('{background src=background.jpg padding=15}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(images/background.jpg)" width=100%><tr><td><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="images/background.jpg" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td class="hide" width=15>&nbsp;</td><td><div class="hide" style="font-size:15px;height:15px;line-height:15px">&nbsp;</div><div class="hide" style="font-size:15px;height:15px;line-height:15px">&nbsp;</div></td><td class="hide" width=15>&nbsp;</td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+  end
+
   it 'supports mobile padding' do
-    Inkcite::Renderer.render('{background src=background.jpg mobile-padding=15}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(images/background.jpg)" width=100%><tr><td class="m1"><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="images/background.jpg" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
+    Inkcite::Renderer.render('{background src=background.jpg mobile-padding=15}{/background}', @view).must_equal('<table border=0 cellpadding=0 cellspacing=0 style="background:url(images/background.jpg)" width=100%><tr><td class="m1"><!--[if mso]><v:rect fill="t" stroke="f" style="mso-width-percent:1000" xmlns:v="urn:schemas-microsoft-com:vml"><v:fill src="images/background.jpg" type="tile" /><v:textbox inset="0,0,0,0" style="mso-fit-shape-to-text:True"><![endif]--><div><table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td></td></tr></table></div><!--[if mso]></v:textbox></v:rect><![endif]--></td></tr></table>')
     @view.media_query.find_by_klass('m1').declaration_string.must_equal('padding:15px')
   end
 

data/test/renderer/div_spec.rb

@@ -147,4 +147,15 @@ describe Inkcite::Renderer::Div do
     @view.media_query.find_by_klass('m1').declarations.must_match('display:block')
   end
 
+  it 'supports mobile height' do
+    Inkcite::Renderer.render('{div mobile-height=215}{/div}', @view).must_equal('<div class="m1"></div>')
+    @view.media_query.find_by_klass('m1').declarations.must_match('height:215px')
+  end
+
+
+  it 'supports mobile height override' do
+    Inkcite::Renderer.render('{div height=63 mobile-height=182}{/div}', @view).must_equal('<div class="m1" style="height:63px"></div>')
+    @view.media_query.find_by_klass('m1').declarations.must_match('height:182px !important')
+  end
+
 end

data/test/renderer/footnote_spec.rb

@@ -6,7 +6,7 @@ describe Inkcite::Renderer::Footnote do
 
   it 'requires text' do
     Inkcite::Renderer.render('({footnote symbol="†"})', @view)
-    @view.errors.must_include('Footnote requires text attribute (line 0) [id=, symbol=†]')
+    assert_error @view, 'Footnote requires text attribute', 'symbol=†'
   end
 
   it 'can have a custom symbol' do
@@ -54,4 +54,8 @@ describe Inkcite::Renderer::Footnote do
     Inkcite::Renderer.render('({footnote text="EPA-estimated fuel economy."}) {footnotes tmpl="[$symbol$] $text$\n\n"}', text_view).must_equal("(1) [1] EPA-estimated fuel economy.\n\n")
   end
 
+  it 'supports the once attribute' do
+    Inkcite::Renderer.render('({footnote id="leatherman" text="Leatherman is a trademark of Leatherman Tool Group, inc." once})({footnote id="leatherman" once})', @view).must_equal("(1)()")
+  end
+
 end

data/test/renderer/image_spec.rb

@@ -6,69 +6,69 @@ describe Inkcite::Renderer::Image do
 
   it 'warns when an image is missing' do
     Inkcite::Renderer.render('{img src=missing.jpg}', @view)
-    @view.errors.must_include('Missing image (line 0) [src=missing.jpg]')
+    assert_error(@view, 'Missing image', 'src=missing.jpg')
   end
 
   it 'warns when image dimesions are missing' do
     Inkcite::Renderer.render('{img src=inkcite.jpg}', @view)
-    @view.errors.must_include('Missing image dimensions (line 0) [src=inkcite.jpg]')
+    assert_error(@view, 'Missing image dimensions', 'src=inkcite.jpg')
   end
 
   it 'substitutes a placeholder for a missing image of sufficient size' do
     @view.config[Inkcite::Email::IMAGE_PLACEHOLDERS] = true
-    Inkcite::Renderer.render('{img src=missing.jpg height=50 width=100}', @view).must_equal('<img border=0 height=50 src="http://placeholdit.imgix.net/~text?fm=jpg&h=50&txt=missing.jpg%0A%28100%C3%9750%29&txtsize=18&txttrack=0&w=100" style="display:block" width=100>')
+    Inkcite::Renderer.render('{img src=missing.jpg height=50 width=100}', @view).must_equal('<img border=0 height=50 id="OWATemporaryImageDivContainer1" src="http://placeholdit.imgix.net/~text?fm=jpg&h=50&txt=missing.jpg%0A%28100%C3%9750%29&txtsize=18&txttrack=0&w=100" style="display:block" width=100>')
   end
 
   it 'has configurable placeholder text' do
     @view.config[Inkcite::Email::IMAGE_PLACEHOLDERS] = true
-    Inkcite::Renderer.render('{img src=missing.jpg height=50 width=100 fpo="F P O"}', @view).must_equal('<img border=0 height=50 src="http://placeholdit.imgix.net/~text?fm=jpg&h=50&txt=F+P+O%0A%28100%C3%9750%29&txtsize=18&txttrack=0&w=100" style="display:block" width=100>')
+    Inkcite::Renderer.render('{img src=missing.jpg height=50 width=100 fpo="F P O"}', @view).must_equal('<img border=0 height=50 id="OWATemporaryImageDivContainer1" src="http://placeholdit.imgix.net/~text?fm=jpg&h=50&txt=F+P+O%0A%28100%C3%9750%29&txtsize=18&txttrack=0&w=100" style="display:block" width=100>')
   end
 
   it 'does not substitute placeholders for small images' do
     @view.config[Inkcite::Email::IMAGE_PLACEHOLDERS] = true
-    Inkcite::Renderer.render('{img src=missing.jpg height=5 width=15}', @view).must_equal('<img border=0 height=5 src="missing.jpg" style="display:block" width=15>')
+    Inkcite::Renderer.render('{img src=missing.jpg height=5 width=15}', @view).must_equal('<img border=0 height=5 id="OWATemporaryImageDivContainer1" src="missing.jpg" style="display:block" width=15>')
   end
 
   it 'does not alter externally referenced images' do
-    Inkcite::Renderer.render('{img src=://i.imgur.com/YJOX1PC.png height=5 width=15}', @view).must_equal('<img border=0 height=5 src="://i.imgur.com/YJOX1PC.png" style="display:block" width=15>')
+    Inkcite::Renderer.render('{img src=://i.imgur.com/YJOX1PC.png height=5 width=15}', @view).must_equal('<img border=0 height=5 id="OWATemporaryImageDivContainer1" src="://i.imgur.com/YJOX1PC.png" style="display:block" width=15>')
   end
 
   it 'has configurable dimensions' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73}', @view).must_equal('<img border=0 height=73 src="images/inkcite.jpg" style="display:block" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73}', @view).must_equal('<img border=0 height=73 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block" width=73>')
   end
 
   it 'has configurable background color' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 bgcolor=#f00}', @view).must_equal('<img border=0 height=73 src="images/inkcite.jpg" style="background-color:#ff0000;display:block" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 bgcolor=#f00}', @view).must_equal('<img border=0 height=73 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="background-color:#ff0000;display:block" width=73>')
   end
 
   it 'has an inline display helper' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 display=inline}', @view).must_equal('<img align=absmiddle border=0 height=73 src="images/inkcite.jpg" style="display:inline;vertical-align:middle" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 display=inline}', @view).must_equal('<img align=absmiddle border=0 height=73 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:inline;vertical-align:middle" width=73>')
   end
 
   it 'has no font styling unless specified' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 alt="Inkcite Avatar"}', @view).must_equal('<img alt="Inkcite Avatar" border=0 height=73 src="images/inkcite.jpg" style="display:block" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 alt="Inkcite Avatar"}', @view).must_equal('<img alt="Inkcite Avatar" border=0 height=73 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block" width=73>')
   end
 
   it 'supports blank alt text' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 alt=""}', @view).must_equal('<img alt="" border=0 height=73 src="images/inkcite.jpg" style="display:block" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 alt=""}', @view).must_equal('<img alt="" border=0 height=73 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block" width=73>')
   end
 
   it 'supports configurable font attributes' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font="small" alt="Inkcite Avatar"}', @view).must_equal('<img alt="Inkcite Avatar" border=0 height=73 src="images/inkcite.jpg" style="color:#cccccc;display:block;font-size:11px" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font="small" alt="Inkcite Avatar"}', @view).must_equal('<img alt="Inkcite Avatar" border=0 height=73 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="color:#cccccc;display:block;font-size:11px" width=73>')
   end
 
   it 'has configurable font size' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font-size=18 alt="Inkcite Avatar"}', @view).must_equal('<img alt="Inkcite Avatar" border=0 height=73 src="images/inkcite.jpg" style="display:block;font-size:18px" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font-size=18 alt="Inkcite Avatar"}', @view).must_equal('<img alt="Inkcite Avatar" border=0 height=73 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block;font-size:18px" width=73>')
   end
 
   it 'supports font-size override' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font="small" font-size=18 alt="Inkcite Avatar"}', @view).must_equal('<img alt="Inkcite Avatar" border=0 height=73 src="images/inkcite.jpg" style="color:#cccccc;display:block;font-size:18px" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font="small" font-size=18 alt="Inkcite Avatar"}', @view).must_equal('<img alt="Inkcite Avatar" border=0 height=73 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="color:#cccccc;display:block;font-size:18px" width=73>')
   end
 
   it 'ignores font attributes when alt text is not present' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font=large}', @view).must_equal('<img border=0 height=73 src="images/inkcite.jpg" style="display:block" width=73>')
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font-size=24}', @view).must_equal('<img border=0 height=73 src="images/inkcite.jpg" style="display:block" width=73>')
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 text-shadow=#f00}', @view).must_equal('<img border=0 height=73 src="images/inkcite.jpg" style="display:block" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font=large}', @view).must_equal('<img border=0 height=73 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 font-size=24}', @view).must_equal('<img border=0 height=73 id="OWATemporaryImageDivContainer2" src="images/inkcite.jpg" style="display:block" width=73>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=73 width=73 text-shadow=#f00}', @view).must_equal('<img border=0 height=73 id="OWATemporaryImageDivContainer3" src="images/inkcite.jpg" style="display:block" width=73>')
   end
 
   it 'includes a timestamp when cache-busting is enabled' do
@@ -76,39 +76,62 @@ describe Inkcite::Renderer::Image do
 
     html = Inkcite::Renderer.render('{img src=inkcite.jpg}', @view)
 
-    html[0,47].must_equal('<img border=0 height=0 src="images/inkcite.jpg?')
-    html[47,10].must_match(/[0-9]{10,}/)
-    html[57..-1].must_equal('" style="display:block" width=0>')
+    html[0, 74].must_equal('<img border=0 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg?')
+    html[74, 10].must_match(/[0-9]{10,}/)
+    html[84..-1].must_equal('" style="display:block">')
   end
 
   it 'can substitute a different image on mobile' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg mobile-src=inkcite-mobile.jpg height=75 width=125}', @view).must_equal('<img border=0 class="i01" height=75 src="images/inkcite.jpg" style="display:block" width=125>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg mobile-src=inkcite-mobile.jpg height=75 id="OWATemporaryImageDivContainer1" width=125}', @view).must_equal('<img border=0 class="i01" height=75 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block" width=125>')
     @view.media_query.find_by_klass('i01').to_css.must_equal('img.i01 { content: url("images/inkcite-mobile.jpg") !important; }')
   end
 
   it 'supports fluid-hybrid desktop and style' do
-    Inkcite::Renderer.render('{img src=inkcite.jpg height=200 width=325 mobile=fluid}', @view).must_equal('<img border=0 src="images/inkcite.jpg" style="display:block;height:auto;max-width:325px;width:100%" width=325>')
+    Inkcite::Renderer.render('{img src=inkcite.jpg height=200 width=325 mobile=fluid}', @view).must_equal('<img border=0 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block;height:auto;max-width:325px;width:100%" width=325>')
   end
 
   it 'supports multi-line alt text' do
-    Inkcite::Renderer.render(%Q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), @view).must_equal(%Q(<img alt="Multiple \nLine \nAlt \nText" border=0 height=150 src="images/inkcite.jpg" style="display:block;white-space:pre" width=100>))
+    Inkcite::Renderer.render(%Q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), @view).must_equal(%Q(<img alt="Multiple \nLine \nAlt \nText" border=0 height=150 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block;white-space:pre" width=100>))
   end
 
   it 'supports virtual (\n) multi-line alt text' do
-    Inkcite::Renderer.render(%q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), @view).must_equal(%Q(<img alt="Multiple \nLine \nAlt \nText" border=0 height=150 src="images/inkcite.jpg" style="display:block;white-space:pre" width=100>))
+    Inkcite::Renderer.render(%q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), @view).must_equal(%Q(<img alt="Multiple \nLine \nAlt \nText" border=0 height=150 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block;white-space:pre" width=100>))
   end
 
   it 'supports multi-line alt text in production, too' do
-    Inkcite::Renderer.render(%Q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), Inkcite::Email.new('test/project/').view(:production, :email)).must_equal(%Q(<img alt="Multiple \nLine \nAlt \nText" border=0 height=150 src="http://production.imagehost.com/emails/myemail/inkcite.jpg" style="display:block;white-space:pre" width=100>))
-    Inkcite::Renderer.render(%q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), Inkcite::Email.new('test/project/').view(:production, :email)).must_equal(%Q(<img alt="Multiple \nLine \nAlt \nText" border=0 height=150 src="http://production.imagehost.com/emails/myemail/inkcite.jpg" style="display:block;white-space:pre" width=100>))
+    Inkcite::Renderer.render(%Q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), Inkcite::Email.new('test/project/').view(:production, :email)).must_equal(%Q(<img alt="Multiple \nLine \nAlt \nText" border=0 height=150 id="OWATemporaryImageDivContainer1" src="http://production.imagehost.com/emails/myemail/inkcite.jpg" style="display:block;white-space:pre" width=100>))
+    Inkcite::Renderer.render(%q({img src=inkcite.jpg height=150 width=100 font=none alt="Multiple\nLine\nAlt\nText"}), Inkcite::Email.new('test/project/').view(:production, :email)).must_equal(%Q(<img alt="Multiple \nLine \nAlt \nText" border=0 height=150 id="OWATemporaryImageDivContainer1" src="http://production.imagehost.com/emails/myemail/inkcite.jpg" style="display:block;white-space:pre" width=100>))
   end
 
   it 'removes HTML from alt text' do
-    Inkcite::Renderer.render(%q({img src=inkcite.jpg height=150 width=100 alt="HTML <i>is not</i> allowed in alt text"}), @view).must_equal(%q(<img alt="HTML is not allowed in alt text" border=0 height=150 src="images/inkcite.jpg" style="display:block" width=100>))
+    Inkcite::Renderer.render(%q({img src=inkcite.jpg height=150 width=100 alt="HTML <i>is not</i> allowed in alt text"}), @view).must_equal(%q(<img alt="HTML is not allowed in alt text" border=0 height=150 id="OWATemporaryImageDivContainer1" src="images/inkcite.jpg" style="display:block" width=100>))
   end
 
   it 'can show a different image in Outlook' do
-    Inkcite::Renderer.render(%q({img src=animated.gif outlook-src=static.jpg height=150 width=100 alt="Don't repeat yourself"}), @view).must_equal(%q(<!--[if mso]><img alt="Don't repeat yourself" border=0 height=150 src="images/static.jpg" style="display:block" width=100><![endif]--><!--[if !mso]><!-- --><img alt="Don't repeat yourself" border=0 height=150 src="images/animated.gif" style="display:block" width=100><!--<![endif]-->))
+    Inkcite::Renderer.render(%q({img src=animated.gif outlook-src=static.jpg height=150 width=100 alt="Don't repeat yourself"}), @view).must_equal(%q(<!--[if mso]><img alt="Don't repeat yourself" border=0 height=150 id="OWATemporaryImageDivContainer1" src="images/static.jpg" style="display:block" width=100><![endif]--><!--[if !mso]><!-- --><img alt="Don't repeat yourself" border=0 height=150 id="OWATemporaryImageDivContainer1" src="images/animated.gif" style="display:block" width=100><!--<![endif]-->))
+  end
+
+  it 'supports mobile margins' do
+    Inkcite::Renderer.render(%q({img src=logo.jpg height=75 width=75 mobile-margin-bottom=15}), @view).must_equal(%q(<img border=0 class="m1" height=75 id="OWATemporaryImageDivContainer1" src="images/logo.jpg" style="display:block" width=75>))
+    @view.media_query.find_by_klass('m1').to_css.must_equal('img.m1 { margin-bottom:15px }')
+  end
+
+  it 'supports mobile-max-width in pixels' do
+    Inkcite::Renderer.render(%q({img src=logo.jpg height=75 width=75 mobile="fill" mobile-max-width=150}), @view).must_equal(%q(<img border=0 class="fill m1" height=75 id="OWATemporaryImageDivContainer1" src="images/logo.jpg" style="display:block" width=75>))
+    @view.media_query.find_by_klass('m1').to_css.must_equal('img.m1 { max-width:150px }')
+  end
+
+  it 'supports mobile-max-width as a percent' do
+    Inkcite::Renderer.render(%q({img src=logo.jpg height=75 width=75 mobile="fill" mobile-max-width=80%}), @view).must_equal(%q(<img border=0 class="fill m1" height=75 id="OWATemporaryImageDivContainer1" src="images/logo.jpg" style="display:block" width=75>))
+    @view.media_query.find_by_klass('m1').to_css.must_equal('img.m1 { max-width:80% }')
+  end
+
+  it 'supports max-height' do
+    Inkcite::Renderer.render(%q({img src=logo.jpg height=75 width=75 max-height=150}), @view).must_equal(%q(<img border=0 height=75 id="OWATemporaryImageDivContainer1" src="images/logo.jpg" style="display:block;max-height:150px" width=75>))
+  end
+
+  it 'supports max-height of zero (needed for carousels)' do
+    Inkcite::Renderer.render(%q({img src=logo.jpg height=75 width=75 max-height=0}), @view).must_equal(%q(<img border=0 height=75 id="OWATemporaryImageDivContainer1" src="images/logo.jpg" style="display:block;max-height:0" width=75>))
   end
 
 end

data/test/renderer/link_spec.rb

@@ -9,38 +9,50 @@ describe Inkcite::Renderer::Link do
   end
 
   it 'can be configured to tag all links' do
-    @view.config[:'tag-links'] = "tag=inkcite|{id}"
+    @view.config[:'tag-links'] = 'tag=inkcite|{id}'
     Inkcite::Renderer.render('{a id="litmus" href="http://litmus.com"}Test Emails Here{/a}', @view).must_equal('<a href="http://litmus.com?tag=inkcite|litmus" style="color:#0099cc;text-decoration:none" target=_blank>Test Emails Here</a>')
   end
 
   it 'can be configured to tag links to specific domains' do
-    @view.config[:'tag-links'] = "tag=inkcite|{id}"
+    @view.config[:'tag-links'] = 'tag=inkcite|{id}'
     @view.config[:'tag-links-domain'] = 'inkceptional.com'
     Inkcite::Renderer.render('{a id="blog" href="http://blog.inkceptional.com"}Our blog{/a}', @view).must_equal('<a href="http://blog.inkceptional.com?tag=inkcite|blog" style="color:#0099cc;text-decoration:none" target=_blank>Our blog</a>')
     Inkcite::Renderer.render('{a id="litmus" href="http://litmus.com"}Test Emails Here{/a}', @view).must_equal('<a href="http://litmus.com" style="color:#0099cc;text-decoration:none" target=_blank>Test Emails Here</a>')
   end
 
+  it 'can be configured to tag links to at different domains' do
+    @view.config[:'tag-links'] = { 'inkceptional.com' => 'tag=inkcite|{id}', 'blog.inkceptional.com' => 'campaign=blog' }
+    Inkcite::Renderer.render('{a id="blog" href="http://blog.inkceptional.com"}Our blog{/a}', @view).must_equal('<a href="http://blog.inkceptional.com?campaign=blog" style="color:#0099cc;text-decoration:none" target=_blank>Our blog</a>')
+    Inkcite::Renderer.render('{a id="litmus" href="http://litmus.com"}Test Emails Here{/a}', @view).must_equal('<a href="http://litmus.com" style="color:#0099cc;text-decoration:none" target=_blank>Test Emails Here</a>')
+    Inkcite::Renderer.render('{a id="cp" href="http://client-preview.inkceptional.com"}Client Previews{/a}', @view).must_equal('<a href="http://client-preview.inkceptional.com?tag=inkcite|cp" style="color:#0099cc;text-decoration:none" target=_blank>Client Previews</a>')
+  end
+
   it 'will not tag mailto: links' do
-    @view.config[:'tag-links'] = "tag=inkcite|{id}"
+    @view.config[:'tag-links'] = 'tag=inkcite|{id}'
     Inkcite::Renderer.render('{a id="contact-us" href="mailto:some.email@some.where"}Contact Us{/a}', @view).must_equal('<a href="mailto:some.email@some.where" style="color:#0099cc;text-decoration:none">Contact Us</a>')
   end
 
   it 'will not tag links that lead to an element in the email' do
-    @view.config[:'tag-links'] = "tag=inkcite|{id}"
+    @view.config[:'tag-links'] = 'tag=inkcite|{id}'
     Inkcite::Renderer.render('{a href="#news"}Latest News{/a}', @view).must_equal('<a href="#news" style="color:#0099cc;text-decoration:none">Latest News</a>')
   end
 
   it 'tags a reused link once and only once' do
-    @view.config[:'tag-links'] = "tag=inkcite|{id}"
+    @view.config[:'tag-links'] = 'tag=inkcite|{id}'
     @view.links_tsv['litmus'] = 'http://litmus.com'
 
     Inkcite::Renderer.render('{a id="litmus"}Test Emails Here{/a}{a id="litmus"}Also Here{/a}', @view).must_equal('<a href="http://litmus.com?tag=inkcite|litmus" style="color:#0099cc;text-decoration:none" target=_blank>Test Emails Here</a><a href="http://litmus.com?tag=inkcite|litmus" style="color:#0099cc;text-decoration:none" target=_blank>Also Here</a>')
 
   end
 
+  it 'accepts no-tag to prevent tagging of a link' do
+    @view.config[:'tag-links'] = { 'inkceptional.com' => 'tag=inkcite|{id}' }
+    Inkcite::Renderer.render('{a id="blog" href="http://blog.inkceptional.com" no-tag}Our blog{/a}', @view).must_equal('<a href="http://blog.inkceptional.com" style="color:#0099cc;text-decoration:none" target=_blank>Our blog</a>')
+  end
+
   it 'raises a warning and generates an ID if one is not present' do
     Inkcite::Renderer.render('{a href="http://inkceptional.com"}Click Here{/a}', @view).must_equal('<a href="http://inkceptional.com" style="color:#0099cc;text-decoration:none" target=_blank>Click Here</a>')
-    @view.errors.must_include('Link missing ID (line 0) [href=http://inkceptional.com]')
+    assert_error @view, 'Link missing ID', 'href="http://inkceptional.com"'
   end
 
   it 'increments its automatically generated link ID' do
@@ -87,12 +99,12 @@ describe Inkcite::Renderer::Link do
 
   it 'detects invalid URLs' do
     Inkcite::Renderer.render(%Q({a id="oops" href="http://ink\nceptional.com"}), @view)
-    @view.errors.must_include(%Q(Link href appears to be invalid (line 0) [id=oops, href=http://ink\nceptional.com]))
+    assert_error(@view, 'Link href appears to be invalid', 'id=oops', "href=http://ink\nceptional.com")
   end
 
   it 'accepts invalid URLs if forced' do
     Inkcite::Renderer.render(%Q({a id="oops" href="http://ink\nceptional.com" force}), @view)
-    @view.errors.must_be_nil
+    assert_no_errors @view
   end
 
   it 'supports the block attribute' do

data/test/renderer/lorem_spec.rb

@@ -10,12 +10,12 @@ describe Inkcite::Renderer::Lorem do
 
   it 'triggers an error when included' do
     Inkcite::Renderer.render('{lorem}', @view)
-    @view.errors.must_include('Email contains Lorem Ipsum (line 0)')
+    assert_error @view, 'Email contains Lorem Ipsum [markup={lorem}]'
   end
 
   it 'does not trigger an error when included and forced' do
     Inkcite::Renderer.render('{lorem force}', @view)
-    @view.errors.must_be_nil
+    assert_no_errors @view
   end
 
 end

data/test/renderer/mobile_image_spec.rb

@@ -16,4 +16,10 @@ describe Inkcite::Renderer::MobileImage do
     @view.media_query.find_by_klass('i01').to_css.must_equal('span.i01 { background-image:url("http://placeholdit.imgix.net/~text?fm=jpg&h=100&txt=inkcite-mobile.jpg%0A%28300%C3%97100%29&txtsize=18&txttrack=0&w=300");height:100px;width:300px }')
   end
 
+  it 'supports mobile margins' do
+    Inkcite::Renderer.render('{mobile-img src=inkcite-mobile.jpg height=100 width=300 margin-bottom=15 margin-left=15}', @view).must_equal('<span class="i01 img"></span>')
+        @view.media_query.find_by_klass('i01').to_css.must_equal('span.i01 { background-image:url("images/inkcite-mobile.jpg");height:100px;margin-bottom:15px;margin-left:15px;width:300px }')
+  end
+
+
 end

data/test/renderer/mobile_style_spec.rb

@@ -6,18 +6,18 @@ describe Inkcite::Renderer::MobileStyle do
 
   it 'requires a class name' do
     Inkcite::Renderer.render('{mobile-style}', @view).must_equal('')
-    @view.errors.must_include('Declaring a mobile style requires a name attribute (line 0)')
+    assert_error(@view, 'Declaring a mobile style requires a name attribute')
   end
 
   it 'requires a style declaration' do
     Inkcite::Renderer.render('{mobile-style name="slider"}', @view).must_equal('')
-    @view.errors.must_include('Declaring a mobile style requires a style attribute (line 0) [name=slider]')
+    assert_error(@view, 'Declaring a mobile style requires a style attribute', 'name=slider')
   end
 
   it 'raises a warning if the class name is not unique' do
     Inkcite::Renderer.render('{mobile-style name="outlined" style="border: 1px solid #f00"}', @view).must_equal('')
     Inkcite::Renderer.render('{mobile-style name="outlined" style="border: 1px solid #0f0"}', @view).must_equal('')
-    @view.errors.must_include('A mobile style was already defined with that class name (line 0) [name=outlined, style=border: 1px solid #0f0]')
+    assert_error(@view, 'A mobile style was already defined with that class name', 'name=outlined', 'style=border: 1px solid #0f0')
   end
 
   it 'adds an inactive responsive style to the context' do