spec/grape/dsl/configuration_spec.rb in grape-0.9.0 vs spec/grape/dsl/configuration_spec.rb in grape-0.10.0

@@ -3,16 +3,10 @@
 module Grape
   module DSL
     module ConfigurationSpec
       class Dummy
         include Grape::DSL::Configuration
-
-        # rubocop:disable TrivialAccessors
-        def self.last_desc
-          @last_description
-        end
-        # rubocop:enable TrivialAccessors
       end
     end
     describe Configuration do
       subject { Class.new(ConfigurationSpec::Dummy) }
       let(:logger) { double(:logger) }
@@ -20,18 +14,63 @@
       describe '.logger' do
         it 'sets a logger' do
           subject.logger logger
           expect(subject.logger).to eq logger
         end
+
+        it 'returns a logger' do
+          expect(subject.logger logger).to eq logger
+        end
       end
 
       describe '.desc' do
         it 'sets a description' do
+          desc_text = 'The description'
           options = { message: 'none' }
-          subject.desc options
-          expect(subject.last_desc).to eq(description: options)
+          subject.desc desc_text, options
+          expect(subject.namespace_setting(:description)).to eq(options.merge(description: desc_text))
+          expect(subject.route_setting(:description)).to eq(options.merge(description: desc_text))
         end
-      end
 
+        it 'can be set with a block' do
+          expected_options = {
+            description: 'The description',
+            detail: 'more details',
+            params: { first: :param },
+            entity: Object,
+            http_codes: [[401, 'Unauthorized', 'Entities::Error']],
+            named: 'My named route',
+            headers: [XAuthToken: {
+              description: 'Valdates your identity',
+              required: true
+            },
+                      XOptionalHeader: {
+                        description: 'Not really needed',
+                        required: false
+                      }
+              ]
+          }
+
+          subject.desc 'The description' do
+            detail 'more details'
+            params(first: :param)
+            success Object
+            failure [[401, 'Unauthorized', 'Entities::Error']]
+            named 'My named route'
+            headers [XAuthToken: {
+              description: 'Valdates your identity',
+              required: true
+            },
+                     XOptionalHeader: {
+                       description: 'Not really needed',
+                       required: false
+                     }
+            ]
+          end
+
+          expect(subject.namespace_setting(:description)).to eq(expected_options)
+          expect(subject.route_setting(:description)).to eq(expected_options)
+        end
+      end
     end
   end
 end