Merge pull request #5318 from jocmp/master

Fix monitor trace suffix method

Author: rmosolgo

gemfiles/rails_master.gemfile

@@ -25,7 +25,7 @@ gem 'selenium-webdriver'
 
 gemspec path: "../"
 
-if Bundler.settings["GEMS__GRAPHQL__PRO"]
+if (cred = Bundler.settings["GEMS__GRAPHQL__PRO"]) && !cred.empty?
   gem "graphql-pro", source: "https://gems.graphql.pro"
   gem "graphql-enterprise", source: "https://gems.graphql.pro"
 end

lib/graphql/tracing/monitor_trace.rb

@@ -90,8 +90,6 @@ module GraphQLSuffixNames
           EXECUTE_NAME = "execute.graphql"
           ANALYZE_NAME = "analyze.graphql"
 
-          private
-
           def platform_field_key(field)
             "#{field.path}.graphql"
           end
@@ -104,8 +102,8 @@ def platform_resolve_type_key(type)
             "#{type.graphql_name}.resolve_type.graphql"
           end
 
-          def platform_source_key(source_class)
-            "#{source_class.name.gsub("::", "_").name.underscore}.fetch.graphql"
+          def platform_source_class_key(source_class)
+            "#{source_class.name.gsub("::", "_")}.fetch.graphql"
           end
         end
 

spec/dummy/test/controllers/dashboard/limiters/limiters_controller_test.rb

@@ -1,35 +1,37 @@
 # frozen_string_literal: true
 require "test_helper"
 
-class DashboardLimitersLimitersControllerTest < ActionDispatch::IntegrationTest
-  def test_it_checks_installed
-    get graphql_dashboard.limiters_limiter_path("runtime", { schema: "GraphQL::Schema" })
-    assert_includes response.body, CGI::escapeHTML("Rate limiters aren't installed on this schema yet.")
-    refute_includes response.headers["Content-Security-Policy"], "nonce-"
-  end
+if defined?(GraphQL::Pro)
+  class DashboardLimitersLimitersControllerTest < ActionDispatch::IntegrationTest
+    def test_it_checks_installed
+      get graphql_dashboard.limiters_limiter_path("runtime", { schema: "GraphQL::Schema" })
+      assert_includes response.body, CGI::escapeHTML("Rate limiters aren't installed on this schema yet.")
+      refute_includes response.headers["Content-Security-Policy"], "nonce-"
+    end
 
-  def test_it_shows_limiters
-    Redis.new(db: DummySchema::DB_NUMBER).flushdb
+    def test_it_shows_limiters
+      Redis.new(db: DummySchema::DB_NUMBER).flushdb
 
-    3.times do
-      DummySchema.execute("{ sleep(seconds: 0.02) }", context: { limiter_key: "client-1" }).to_h
-    end
-    4.times do
-      DummySchema.execute("{ sleep(seconds: 0.110) }", context: { limiter_key: "client-2" }).to_h
-    end
+      3.times do
+        DummySchema.execute("{ sleep(seconds: 0.02) }", context: { limiter_key: "client-1" }).to_h
+      end
+      4.times do
+        DummySchema.execute("{ sleep(seconds: 0.110) }", context: { limiter_key: "client-2" }).to_h
+      end
 
-    get graphql_dashboard.limiters_limiter_path("runtime")
-    assert_includes response.body, "<span class=\"data\">4</span>"
-    assert_includes response.body, "<span class=\"data\">3</span>"
-    assert_includes response.body, "Disable Soft Limiting"
-    assert_includes response.headers["Content-Security-Policy"], "nonce-"
+      get graphql_dashboard.limiters_limiter_path("runtime")
+      assert_includes response.body, "<span class=\"data\">4</span>"
+      assert_includes response.body, "<span class=\"data\">3</span>"
+      assert_includes response.body, "Disable Soft Limiting"
+      assert_includes response.headers["Content-Security-Policy"], "nonce-"
 
-    patch graphql_dashboard.limiters_limiter_path("runtime")
-    get graphql_dashboard.limiters_limiter_path("runtime")
-    assert_includes response.body, "Enable Soft Limiting"
+      patch graphql_dashboard.limiters_limiter_path("runtime")
+      get graphql_dashboard.limiters_limiter_path("runtime")
+      assert_includes response.body, "Enable Soft Limiting"
 
-    get graphql_dashboard.limiters_limiter_path("active_operations")
-    assert_includes response.body, "It looks like this limiter isn't installed yet."
+      get graphql_dashboard.limiters_limiter_path("active_operations")
+      assert_includes response.body, "It looks like this limiter isn't installed yet."
 
+    end
   end
 end

spec/dummy/test/controllers/dashboard/operation_store/clients_controller_test.rb

@@ -1,63 +1,65 @@
 # frozen_string_literal: true
 require "test_helper"
 
-class DashboardOperationStoreClientsControllerTest < ActionDispatch::IntegrationTest
-  def test_it_manages_clients
-    assert_equal 0, DummySchema.operation_store.all_clients(page: 1, per_page: 1).total_count
-    get graphql_dashboard.operation_store_clients_path
-    assert_includes response.body, "0 Clients"
-    assert_includes response.body, "To get started, create"
-
-    get graphql_dashboard.new_operation_store_client_path
-    assert_includes response.body, "New Client"
-
-    post graphql_dashboard.operation_store_clients_path, params: {
-      client: {
-        name: "client-1",
-        secret: "abcdefedcba"
-      }
-    }
+if defined?(GraphQL::Pro)
+  class DashboardOperationStoreClientsControllerTest < ActionDispatch::IntegrationTest
+    def test_it_manages_clients
+      assert_equal 0, DummySchema.operation_store.all_clients(page: 1, per_page: 1).total_count
+      get graphql_dashboard.operation_store_clients_path
+      assert_includes response.body, "0 Clients"
+      assert_includes response.body, "To get started, create"
 
-    get graphql_dashboard.operation_store_clients_path
-    assert_includes response.body, "1 Client"
+      get graphql_dashboard.new_operation_store_client_path
+      assert_includes response.body, "New Client"
 
-    get graphql_dashboard.edit_operation_store_client_path(name: "client-1")
-    assert_includes response.body, "abcdefedcba"
+      post graphql_dashboard.operation_store_clients_path, params: {
+        client: {
+          name: "client-1",
+          secret: "abcdefedcba"
+        }
+      }
 
-    patch graphql_dashboard.operation_store_client_path(name: "client-1"), params: { client: { secret: "123456789" } }
-    get graphql_dashboard.edit_operation_store_client_path(name: "client-1")
-    assert_includes response.body, "123456789"
+      get graphql_dashboard.operation_store_clients_path
+      assert_includes response.body, "1 Client"
 
-    delete graphql_dashboard.operation_store_client_path(name: "client-1")
-    assert_equal 0, DummySchema.operation_store.all_clients(page: 1, per_page: 1).total_count
-  ensure
-    DummySchema.operation_store.delete_client("client-1")
-  end
+      get graphql_dashboard.edit_operation_store_client_path(name: "client-1")
+      assert_includes response.body, "abcdefedcba"
 
-  def test_it_paginates
-    5.times do |i|
-      DummySchema.operation_store.upsert_client("client-#{i}", "abcdef")
+      patch graphql_dashboard.operation_store_client_path(name: "client-1"), params: { client: { secret: "123456789" } }
+      get graphql_dashboard.edit_operation_store_client_path(name: "client-1")
+      assert_includes response.body, "123456789"
+
+      delete graphql_dashboard.operation_store_client_path(name: "client-1")
+      assert_equal 0, DummySchema.operation_store.all_clients(page: 1, per_page: 1).total_count
+    ensure
+      DummySchema.operation_store.delete_client("client-1")
     end
-    get graphql_dashboard.operation_store_clients_path(per_page: 2)
-    assert_includes response.body, "5 Clients"
-    assert_includes response.body, "?page=2&amp;per_page=2"
-    assert_includes response.body, "disabled>« prev</button>"
-
-    get graphql_dashboard.operation_store_clients_path(per_page: 2, page: 2)
-    assert_includes response.body, "?page=1&amp;per_page=2"
-    assert_includes response.body, "?page=3&amp;per_page=2"
-
-    get graphql_dashboard.operation_store_clients_path(per_page: 2, page: 3)
-    assert_includes response.body, "disabled>next »</button>"
-    assert_includes response.body, "?page=2&amp;per_page=2"
-  ensure
-    5.times do |i|
-      DummySchema.operation_store.delete_client("client-#{i}")
+
+    def test_it_paginates
+      5.times do |i|
+        DummySchema.operation_store.upsert_client("client-#{i}", "abcdef")
+      end
+      get graphql_dashboard.operation_store_clients_path(per_page: 2)
+      assert_includes response.body, "5 Clients"
+      assert_includes response.body, "?page=2&amp;per_page=2"
+      assert_includes response.body, "disabled>« prev</button>"
+
+      get graphql_dashboard.operation_store_clients_path(per_page: 2, page: 2)
+      assert_includes response.body, "?page=1&amp;per_page=2"
+      assert_includes response.body, "?page=3&amp;per_page=2"
+
+      get graphql_dashboard.operation_store_clients_path(per_page: 2, page: 3)
+      assert_includes response.body, "disabled>next »</button>"
+      assert_includes response.body, "?page=2&amp;per_page=2"
+    ensure
+      5.times do |i|
+        DummySchema.operation_store.delete_client("client-#{i}")
+      end
     end
-  end
 
-  def test_it_checks_installed
-    get graphql_dashboard.new_operation_store_client_path, params: { schema: GraphQL::Schema }
-    assert_includes response.body, "isn't installed for this schema yet"
+    def test_it_checks_installed
+      get graphql_dashboard.new_operation_store_client_path, params: { schema: GraphQL::Schema }
+      assert_includes response.body, "isn't installed for this schema yet"
+    end
   end
 end

spec/dummy/test/controllers/dashboard/operation_store/index_entries_controller_test.rb

@@ -1,30 +1,32 @@
 # frozen_string_literal: true
 require "test_helper"
 
-class DashboardOperationStoreIndexEntriesControllerTest < ActionDispatch::IntegrationTest
-  def test_it_shows_entries
-    DummySchema.operation_store.upsert_client("client-1", "abcdef")
-    DummySchema.operation_store.add(body: "query GetTypename { __type(name: \"Query\") { name @skip(if: true) } }", operation_alias: "GetTypename", client_name: "client-1")
+if defined?(GraphQL::Pro)
+  class DashboardOperationStoreIndexEntriesControllerTest < ActionDispatch::IntegrationTest
+    def test_it_shows_entries
+      DummySchema.operation_store.upsert_client("client-1", "abcdef")
+      DummySchema.operation_store.add(body: "query GetTypename { __type(name: \"Query\") { name @skip(if: true) } }", operation_alias: "GetTypename", client_name: "client-1")
 
-    get graphql_dashboard.operation_store_index_entries_path
-    assert_includes response.body, "Query.__type.name"
-    assert_includes response.body, "7 entries"
+      get graphql_dashboard.operation_store_index_entries_path
+      assert_includes response.body, "Query.__type.name"
+      assert_includes response.body, "7 entries"
 
-    get graphql_dashboard.operation_store_index_entries_path(q: "Query")
-    assert_includes response.body, "3 results"
-    assert_includes response.body, ">Query</a>"
-    assert_includes response.body, ">Query.__type</a>"
-    assert_includes response.body, ">Query.__type.name</a>"
+      get graphql_dashboard.operation_store_index_entries_path(q: "Query")
+      assert_includes response.body, "3 results"
+      assert_includes response.body, ">Query</a>"
+      assert_includes response.body, ">Query.__type</a>"
+      assert_includes response.body, ">Query.__type.name</a>"
 
-    get graphql_dashboard.operation_store_index_entries_path(q: "Query", per_page: 1, page: 2)
-    assert_includes response.body, "3 results"
-    refute_includes response.body, ">Query</a>"
-    assert_includes response.body, ">Query.__type</a>"
-    refute_includes response.body, ">Query.__type.name</a>"
+      get graphql_dashboard.operation_store_index_entries_path(q: "Query", per_page: 1, page: 2)
+      assert_includes response.body, "3 results"
+      refute_includes response.body, ">Query</a>"
+      assert_includes response.body, ">Query.__type</a>"
+      refute_includes response.body, ">Query.__type.name</a>"
 
-    get graphql_dashboard.operation_store_index_entry_path(name: "Query.__type.name")
-    assert_includes response.body, "GetTypename"
-  ensure
-    DummySchema.operation_store.delete_client("client-1")
+      get graphql_dashboard.operation_store_index_entry_path(name: "Query.__type.name")
+      assert_includes response.body, "GetTypename"
+    ensure
+      DummySchema.operation_store.delete_client("client-1")
+    end
   end
 end