Cleanup for #125

hanami · Sep 16, 2015 · 25e731f · 25e731f
1 parent 4bae469
commit 25e731f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/lib/lotus/action/mime.rb b/lib/lotus/action/mime.rb
@@ -422,7 +422,7 @@ def accepts
         end
       end
 
-      # @since 0.5.0 - TODO: Confirm?
+      # @since 0.5.0
       # @api private
       def default_response_type
         self.class.format_to_mime_type(configuration.default_response_format) if configuration.default_response_format

diff --git a/lib/lotus/controller/configuration.rb b/lib/lotus/controller/configuration.rb
@@ -427,6 +427,7 @@ def format(hash)
       #   Gets the value
       #   @return [Symbol,nil]
       #
+      # @since 0.5.0
       #
       # @see Lotus::Action::Mime
       #
@@ -441,8 +442,6 @@ def format(hash)
       #   Lotus::Controller.configure do
       #     default_request_format :html
       #   end
-      #
-      # @since 0.5.0 TODO: Confirm?
       def default_request_format(format = nil)
         if format
           @default_request_format = Utils::Kernel.Symbol(format)
@@ -483,6 +482,7 @@ def default_format(format = nil)
       #   Gets the value
       #   @return [Symbol,nil]
       #
+      # @since 0.5.0
       #
       # @see Lotus::Action::Mime
       #
@@ -497,8 +497,6 @@ def default_format(format = nil)
       #   Lotus::Controller.configure do
       #     default_response_format :json
       #   end
-      #
-      # @since 0.5.0 TODO: Confirm?
       def default_response_format(format = nil)
         if format
           @default_response_format = Utils::Kernel.Symbol(format)

diff --git a/test/configuration_test.rb b/test/configuration_test.rb
@@ -198,24 +198,33 @@ def hash
       end
     end
 
+    require 'lotus/utils/io'
     describe "when not previously set" do
       it 'returns nil' do
-        @configuration.default_format.must_be_nil
+        Lotus::Utils::IO.silence_warnings do
+          @configuration.default_format.must_be_nil
+        end
       end
     end
 
     describe "when set" do
       before do
-        @configuration.default_format :html
+        Lotus::Utils::IO.silence_warnings do
+          @configuration.default_format :html
+        end
       end
 
       it 'returns the value' do
-        @configuration.default_format.must_equal :html
+        Lotus::Utils::IO.silence_warnings do
+          @configuration.default_format.must_equal :html
+        end
       end
     end
 
     it 'raises an error if the given format cannot be coerced into symbol' do
-      -> { @configuration.default_format(23) }.must_raise TypeError
+      Lotus::Utils::IO.silence_warnings do
+        -> { @configuration.default_format(23) }.must_raise TypeError
+      end
     end
   end