Remove comments, apply suggestions and DRY up specs

Author: David Revelo

lib/graphql_devise/schema_plugin.rb

@@ -43,18 +43,16 @@ def set_current_resource(context)
       controller     = context[:controller]
       resource_names = Array(context[:resource_name])
 
-      if context[:current_resource].blank?
-        context[:current_resource] = resource_names.find do |resource_name|
-          unless Devise.mappings.key?(resource_name)
-            raise(
-              GraphqlDevise::Error,
-              "Invalid resource_name `#{resource_name}` provided to `graphql_context`. Possible values are: #{Devise.mappings.keys}."
-            )
-          end
-
-          found = controller.set_resource_by_token(resource_name)
-          break found if found
+      context[:current_resource] ||= resource_names.find do |resource_name|
+        unless Devise.mappings.key?(resource_name)
+          raise(
+            GraphqlDevise::Error,
+            "Invalid resource_name `#{resource_name}` provided to `graphql_context`. Possible values are: #{Devise.mappings.keys}."
+          )
         end
+
+        found = controller.set_resource_by_token(resource_name)
+        break found if found
       end
 
       context

spec/graphql/user_queries_spec.rb

@@ -1,11 +1,21 @@
+# frozen_string_literal: true
 
 require 'rails_helper'
 
 RSpec.describe 'Sign Up process' do
   include_context 'with graphql schema test'
 
-  let(:schema) { DummySchema }
-  let(:user)   { create(:user, :confirmed) }
+  let(:schema)          { DummySchema }
+  let(:user)            { create(:user, :confirmed) }
+  let(:field)           { 'privateField' }
+  let(:public_message)  { 'Field does not require authentication' }
+  let(:private_message) { 'Field will always require authentication' }
+  let(:private_error) do
+    {
+      message:    "#{field} field requires authentication",
+      extensions: { code: 'AUTHENTICATION_ERROR' }
+    }
+  end
 
   describe 'publicField' do
     let(:query) do
@@ -18,7 +28,7 @@
 
     context 'when using a regular schema' do
       it 'does not require authentication' do
-        expect(response[:data][:publicField]).to eq('Field does not require authentication')
+        expect(response[:data][:publicField]).to eq(public_message)
       end
     end
   end
@@ -37,26 +47,21 @@
         let(:resource) { user }
 
         it 'allows to perform the query' do
-          expect(response[:data][:privateField]).to eq('Field will always require authentication')
+          expect(response[:data][:privateField]).to eq(private_message)
         end
 
         context 'when using a SchemaUser' do
           let(:resource) { create(:schema_user, :confirmed) }
 
           it 'allows to perform the query' do
-            expect(response[:data][:privateField]).to eq('Field will always require authentication')
+            expect(response[:data][:privateField]).to eq(private_message)
           end
         end
       end
 
       context 'when user is not authenticated' do
         it 'returns a must sign in error' do
-          expect(response[:errors]).to contain_exactly(
-            hash_including(
-              message:    'privateField field requires authentication',
-              extensions: { code: 'AUTHENTICATION_ERROR' }
-            )
-          )
+          expect(response[:errors]).to contain_exactly(hash_including(**private_error))
         end
       end
     end
@@ -68,24 +73,20 @@
         let(:resource) { user }
 
         it 'allows to perform the query' do
-          expect(response[:data][:privateField]).to eq('Field will always require authentication')
+          expect(response[:data][:privateField]).to eq(private_message)
         end
       end
 
       context 'when user is not authenticated' do
         it 'returns a must sign in error' do
-          expect(response[:errors]).to contain_exactly(
-            hash_including(
-              message:    'privateField field requires authentication',
-              extensions: { code: 'AUTHENTICATION_ERROR' }
-            )
-          )
+          expect(response[:errors]).to contain_exactly(hash_including(**private_error))
         end
       end
     end
   end
 
   describe 'user' do
+    let(:user_data) { { email: user.email, id: user.id } }
     let(:query) do
       <<-GRAPHQL
         query {
@@ -102,21 +103,15 @@
         let(:resource) { user }
 
         it 'allows to perform the query' do
-          expect(response[:data][:user]).to match(
-            email: user.email,
-            id:    user.id
-          )
+          expect(response[:data][:user]).to match(**user_data)
         end
       end
 
       context 'when user is not authenticated' do
+        let(:field) { 'user' }
+
         it 'returns a must sign in error' do
-          expect(response[:errors]).to contain_exactly(
-            hash_including(
-              message: 'user field requires authentication',
-              extensions: { code: 'AUTHENTICATION_ERROR' }
-            )
-          )
+          expect(response[:errors]).to contain_exactly(hash_including(**private_error))
         end
       end
     end
@@ -128,20 +123,14 @@
         let(:resource) { user }
 
         it 'allows to perform the query' do
-          expect(response[:data][:user]).to match(
-            email: user.email,
-            id:    user.id
-          )
+          expect(response[:data][:user]).to match(**user_data)
         end
       end
 
       context 'when user is not authenticated' do
         # Interpreter schema fields are public unless specified otherwise (plugin setting)
         it 'allows to perform the query' do
-          expect(response[:data][:user]).to match(
-            email: user.email,
-            id:    user.id
-          )
+          expect(response[:data][:user]).to match(**user_data)
         end
       end
     end

spec/support/contexts/schema_test.rb

@@ -1,15 +1,9 @@
 RSpec.shared_context 'with graphql schema test' do
   let(:variables)  { {} }
   let(:resource)   { nil }
-  let(:controller) { instance_double(Api::V1::GraphqlController) }
+  let(:controller) { instance_double(GraphqlDevise::GraphqlController) }
   let(:context)    { { current_resource: resource, controller: controller } }
   let(:response) do
     schema.execute(query, context: context, variables: variables).deep_symbolize_keys
   end
-
-  # before do
-  #   allow_any_instance_of(GraphqlDevise::Mutations::Login).to receive(:set_auth_headers)
-  #   allow(controller).to receive(:request).and_return(request)
-  #   # allow(controller).to receive(:response).and_return(response)
-  # end
 end