It's an ArgumentError

Author: benpickles

lib/phlex-sinatra.rb

@@ -6,7 +6,7 @@
 module Phlex
   module Sinatra
     Error = Class.new(StandardError)
-    IncompatibleOptionError = Class.new(Error)
+    ArgumentError = Class.new(Error)
 
     class TypeError < Error
       MAX_SIZE = 32
@@ -47,6 +47,10 @@ def phlex(
     )
       raise Phlex::Sinatra::TypeError.new(obj) unless obj.is_a?(Phlex::SGML)
 
+      if layout && stream
+        raise Phlex::Sinatra::ArgumentError.new('streaming is not compatible with layout')
+      end
+
       content_type ||= :svg if obj.is_a?(Phlex::SVG) && !layout
       self.content_type(content_type) if content_type
 
@@ -55,10 +59,6 @@ def phlex(
       layout = @default_layout if layout == true
 
       if stream
-        raise Phlex::Sinatra::IncompatibleOptionError.new(
-          'streaming is not compatible with layout'
-        ) if layout
-
         self.stream do |out|
           obj.call(out, view_context: self)
         end

spec/general_spec.rb

@@ -179,10 +179,10 @@ def app
       expect(last_response.body).to start_with('<main><pre>')
     end
 
-    it 'raises an error stream=true' do
+    it 'raises an error if stream=true' do
       expect {
         get('/stream-with-layout')
-      }.to raise_error(Phlex::Sinatra::IncompatibleOptionError)
+      }.to raise_error(Phlex::Sinatra::ArgumentError)
     end
 
     it 'works with non-ERB templates' do