Fix smithy spec

Author: Matt Muller

gems/smithy/spec/interfaces/client/auth_resolver_spec.rb

@@ -15,25 +15,29 @@
         it 'returns the auth options alphabetically by default' do
           params = NoAuthTrait::AuthParameters.new(operation_name: :operation_a)
           auth_options = subject.resolve(params)
-          expected = %w[smithy.api#httpBasicAuth smithy.api#httpBearerAuth smithy.api#httpDigestAuth]
+          expected = [
+            { scheme_id: 'smithy.api#httpBasicAuth' },
+            { scheme_id: 'smithy.api#httpBearerAuth' },
+            { scheme_id: 'smithy.api#httpDigestAuth' }
+          ]
           expect(auth_options).to eq(expected)
         end
 
         it 'returns the auth options for the operation with the auth trait' do
           params = NoAuthTrait::AuthParameters.new(operation_name: :operation_b)
           auth_options = subject.resolve(params)
-          expect(auth_options).to eq(['smithy.api#httpDigestAuth'])
+          expect(auth_options).to eq([{ scheme_id: 'smithy.api#httpDigestAuth' }])
         end
 
         it 'returns the auth options for the operation with the optionalAuth trait' do
           params = NoAuthTrait::AuthParameters.new(operation_name: :operation_g)
           auth_options = subject.resolve(params)
           expect(auth_options).to eq(
-            %w[
-              smithy.api#httpBasicAuth
-              smithy.api#httpBearerAuth
-              smithy.api#httpDigestAuth
-              smithy.api#noAuth
+            [
+              { scheme_id: 'smithy.api#httpBasicAuth' },
+              { scheme_id: 'smithy.api#httpBearerAuth' },
+              { scheme_id: 'smithy.api#httpDigestAuth' },
+              { scheme_id: 'smithy.api#noAuth' }
             ]
           )
         end
@@ -49,26 +53,32 @@
         it 'returns the auth options with the service auth trait' do
           params = AuthTrait::AuthParameters.new(operation_name: :operation_c)
           auth_options = subject.resolve(params)
-          expected = %w[smithy.api#httpBasicAuth smithy.api#httpDigestAuth]
+          expected = [{ scheme_id: 'smithy.api#httpBasicAuth' }, { scheme_id: 'smithy.api#httpDigestAuth' }]
           expect(auth_options).to eq(expected)
         end
 
         it 'returns the auth options for the operation overriding the service auth trait' do
           params = AuthTrait::AuthParameters.new(operation_name: :operation_d)
           auth_options = subject.resolve(params)
-          expect(auth_options).to eq(['smithy.api#httpBearerAuth'])
+          expect(auth_options).to eq([{ scheme_id: 'smithy.api#httpBearerAuth' }])
         end
 
         it 'returns a noAuth option when the auth trait is empty' do
           params = AuthTrait::AuthParameters.new(operation_name: :operation_e)
           auth_options = subject.resolve(params)
-          expect(auth_options).to eq(['smithy.api#noAuth'])
+          expect(auth_options).to eq([{ scheme_id: 'smithy.api#noAuth' }])
         end
 
         it 'returns the auth options for the operation with the optionalAuth trait' do
           params = AuthTrait::AuthParameters.new(operation_name: :operation_f)
           auth_options = subject.resolve(params)
-          expect(auth_options).to eq(%w[smithy.api#httpBasicAuth smithy.api#httpDigestAuth smithy.api#noAuth])
+          expect(auth_options).to eq(
+            [
+              { scheme_id: 'smithy.api#httpBasicAuth' },
+              { scheme_id: 'smithy.api#httpDigestAuth' },
+              { scheme_id: 'smithy.api#noAuth' }
+            ]
+          )
         end
       end
     end
@@ -82,13 +92,13 @@
         it 'returns the auth options for the operation with no auth traits' do
           params = NoAuth::AuthParameters.new(operation_name: :operation_h)
           auth_options = subject.resolve(params)
-          expect(auth_options).to eq(['smithy.api#noAuth'])
+          expect(auth_options).to eq([{ scheme_id: 'smithy.api#noAuth' }])
         end
 
         it 'returns the auth options for the operation with the optionalAuth trait' do
           params = NoAuth::AuthParameters.new(operation_name: :operation_i)
           auth_options = subject.resolve(params)
-          expect(auth_options).to eq(['smithy.api#noAuth'])
+          expect(auth_options).to eq([{ scheme_id: 'smithy.api#noAuth' }])
         end
       end
     end

gems/smithy/spec/interfaces/welds/auth_schemes_spec.rb

@@ -36,14 +36,14 @@ def remove_auth_schemes
         auth_resolver = ServiceWithAuthTrait::AuthResolver.new
         auth_parameters = ServiceWithAuthTrait::AuthParameters.new(operation_name: :operation_c)
         resolved_auths = auth_resolver.resolve(auth_parameters)
-        expect(resolved_auths).to include('smithy.api#httpBasicAuth')
+        expect(resolved_auths).to include({ scheme_id: 'smithy.api#httpBasicAuth' })
       end
 
       it 'removes auth schemes from the client' do
         auth_resolver = ServiceWithAuthTrait::AuthResolver.new
         auth_parameters = ServiceWithAuthTrait::AuthParameters.new(operation_name: :operation_d)
         resolved_auths = auth_resolver.resolve(auth_parameters)
-        expect(resolved_auths).to_not include('smithy.api#httpBearerAuth')
+        expect(resolved_auths).to_not include({ scheme_id: 'smithy.api#httpBearerAuth' })
       end
     end
   end