Merge pull request rmosolgo#3986 from geshwho/mt/repeatable-directives

Allow multiples of repeatable directives

Author: rmosolgo

lib/graphql/schema/member/has_directives.rb

@@ -11,7 +11,7 @@ module HasDirectives
         # @return [void]
         def directive(dir_class, **options)
           @own_directives ||= []
-          remove_directive(dir_class)
+          remove_directive(dir_class) unless dir_class.repeatable?
           @own_directives << dir_class.new(self, **options)
           nil
         end

spec/graphql/schema/directive_spec.rb

@@ -80,6 +80,46 @@ class Thing < GraphQL::Schema::Object
     assert_equal "@secret.topSecret is required, but no value was given", err2.message
   end
 
+  describe 'repeatable directives' do
+    module RepeatDirectiveTest
+      class Secret < GraphQL::Schema::Directive
+        argument :secret, String
+        locations OBJECT, INTERFACE
+        repeatable true
+      end
+
+      class OtherSecret < GraphQL::Schema::Directive
+        argument :secret, String
+        locations OBJECT, INTERFACE
+        repeatable false
+      end
+
+      class Thing < GraphQL::Schema::Object
+        directive(Secret, secret: "my secret")
+        directive(Secret, secret: "my second secret")
+
+        directive(OtherSecret, secret: "other secret")
+        directive(OtherSecret, secret: "second other secret")
+      end
+    end
+
+    it "allows repeatable directives twice" do
+      directives = RepeatDirectiveTest::Thing.directives
+      secret_directives = directives.select{ |x| x.is_a?(RepeatDirectiveTest::Secret) }
+
+      assert_equal 2, secret_directives.size
+      assert_equal ["my secret", "my second secret"], secret_directives.map{ |d| d.arguments[:secret] }
+    end
+
+    it "overwrites non-repeatable directives" do
+      directives = RepeatDirectiveTest::Thing.directives
+      other_directives = directives.select{ |x| x.is_a?(RepeatDirectiveTest::OtherSecret) }
+
+      assert_equal 1, other_directives.size
+      assert_equal ["second other secret"], other_directives.map{ |d| d.arguments[:secret] }
+    end
+  end
+
   module RuntimeDirectiveTest
     class CountFields < GraphQL::Schema::Directive
       locations(FIELD, FRAGMENT_SPREAD, INLINE_FRAGMENT)