graphql 0.18.4 → 0.18.5

data/spec/graphql/interface_type_spec.rb

@@ -8,11 +8,6 @@ describe GraphQL::InterfaceType do
     assert_equal([CheeseType, HoneyType, MilkType], DummySchema.possible_types(interface))
   end
 
-  it "resolves types for objects" do
-    assert_equal(CheeseType, interface.resolve_type(CHEESES.values.first, dummy_query_context))
-    assert_equal(MilkType, interface.resolve_type(MILKS.values.first, dummy_query_context))
-  end
-
   describe "query evaluation" do
     let(:result) { DummySchema.execute(query_string, variables: {"cheeseId" => 2})}
     let(:query_string) {%|
@@ -40,20 +35,6 @@ describe GraphQL::InterfaceType do
     end
   end
 
-  describe '#resolve_type' do
-    let(:interface) {
-      GraphQL::InterfaceType.define do
-        resolve_type -> (object, ctx) {
-          :custom_resolve
-        }
-      end
-    }
-
-    it "can be overriden in the definition" do
-      assert_equal(interface.resolve_type(123, nil), :custom_resolve)
-    end
-  end
-
   describe "fragments" do
     let(:query_string) {%|
     {

data/spec/graphql/query/context_spec.rb

@@ -16,7 +16,7 @@ describe GraphQL::Query::Context do
       resolve -> (target, args, ctx) { ctx.query.class.name }
     end
   }}
-  let(:schema) { GraphQL::Schema.new(query: query_type, mutation: nil)}
+  let(:schema) { GraphQL::Schema.define(query: query_type, mutation: nil)}
   let(:result) { schema.execute(query_string, context: {"some_key" => "some value"})}
 
   describe "access to passed-in values" do

data/spec/graphql/query/executor_spec.rb

@@ -85,7 +85,7 @@ describe GraphQL::Query::Executor do
         end
       end
 
-      GraphQL::Schema.new(query: DummyQueryType, mutation: MutationType)
+      GraphQL::Schema.define(query: DummyQueryType, mutation: MutationType)
     }
     let(:variables) { nil }
     let(:query_string) { %|

data/spec/graphql/query/serial_execution/value_resolution_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe GraphQL::Query::SerialExecution::ValueResolution do
-  let(:query_root) {
+  let(:schema) {
     day_of_week_enum = GraphQL::EnumType.define do
       name "DayOfWeek"
       value("MONDAY", value: 0)
@@ -16,10 +16,9 @@ describe GraphQL::Query::SerialExecution::ValueResolution do
     interface = GraphQL::InterfaceType.define do
       name "SomeInterface"
       field :someField, !types.Int
-      resolve_type ->(obj, ctx) { nil }
     end
 
-    GraphQL::ObjectType.define do
+    query_root = GraphQL::ObjectType.define do
       name "Query"
       field :tomorrow, day_of_week_enum do
         argument :today, day_of_week_enum
@@ -29,8 +28,13 @@ describe GraphQL::Query::SerialExecution::ValueResolution do
         resolve ->(obj, args, ctx) { Object.new }
       end
     end
+
+    GraphQL::Schema.define do
+      query(query_root)
+      resolve_type -> (obj, ctx) { nil }
+    end
   }
-  let(:schema) { GraphQL::Schema.new(query: query_root) }
+
   let(:result) { schema.execute(
     query_string,
   )}

data/spec/graphql/relay/array_connection_spec.rb

@@ -33,7 +33,7 @@ describe GraphQL::Relay::ArrayConnection do
     |}
 
     it 'limits the result' do
-      result = query(query_string, "first" => 2)
+      result = star_wars_query(query_string, "first" => 2)
       number_of_ships = get_names(result).length
       assert_equal(2, number_of_ships)
       assert_equal(true, result["data"]["rebels"]["ships"]["pageInfo"]["hasNextPage"])
@@ -41,19 +41,19 @@ describe GraphQL::Relay::ArrayConnection do
       assert_equal("MQ==", result["data"]["rebels"]["ships"]["pageInfo"]["startCursor"])
       assert_equal("Mg==", result["data"]["rebels"]["ships"]["pageInfo"]["endCursor"])
 
-      result = query(query_string, "first" => 3)
+      result = star_wars_query(query_string, "first" => 3)
       number_of_ships = get_names(result).length
       assert_equal(3, number_of_ships)
     end
 
     it 'provides pageInfo' do
-      result = query(query_string, "first" => 2)
+      result = star_wars_query(query_string, "first" => 2)
       assert_equal(true, result["data"]["rebels"]["ships"]["pageInfo"]["hasNextPage"])
       assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasPreviousPage"])
       assert_equal("MQ==", result["data"]["rebels"]["ships"]["pageInfo"]["startCursor"])
       assert_equal("Mg==", result["data"]["rebels"]["ships"]["pageInfo"]["endCursor"])
 
-      result = query(query_string, "first" => 100)
+      result = star_wars_query(query_string, "first" => 100)
       assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasNextPage"])
       assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasPreviousPage"])
       assert_equal("MQ==", result["data"]["rebels"]["ships"]["pageInfo"]["startCursor"])
@@ -61,38 +61,38 @@ describe GraphQL::Relay::ArrayConnection do
     end
 
     it 'slices the result' do
-      result = query(query_string, "first" => 1)
+      result = star_wars_query(query_string, "first" => 1)
       assert_equal(["X-Wing"], get_names(result))
 
       # After the last result, find the next 2:
       last_cursor = get_last_cursor(result)
 
-      result = query(query_string, "after" => last_cursor, "first" => 2)
+      result = star_wars_query(query_string, "after" => last_cursor, "first" => 2)
       assert_equal(["Y-Wing", "A-Wing"], get_names(result))
 
       # After the last result, find the next 2:
       last_cursor = get_last_cursor(result)
 
-      result = query(query_string, "after" => last_cursor, "first" => 2)
+      result = star_wars_query(query_string, "after" => last_cursor, "first" => 2)
       assert_equal(["Millenium Falcon", "Home One"], get_names(result))
 
-      result = query(query_string, "before" => last_cursor, "last" => 2)
+      result = star_wars_query(query_string, "before" => last_cursor, "last" => 2)
       assert_equal(["X-Wing", "Y-Wing"], get_names(result))
     end
 
     it 'applies custom arguments' do
-      result = query(query_string, "nameIncludes" => "Wing", "first" => 2)
+      result = star_wars_query(query_string, "nameIncludes" => "Wing", "first" => 2)
       names = get_names(result)
       assert_equal(2, names.length)
 
       after = get_last_cursor(result)
-      result = query(query_string, "nameIncludes" => "Wing", "after" => after, "first" => 3)
+      result = star_wars_query(query_string, "nameIncludes" => "Wing", "after" => after, "first" => 3)
       names = get_names(result)
       assert_equal(1, names.length)
     end
 
     it 'works without first/last/after/before' do
-      result = query(query_string)
+      result = star_wars_query(query_string)
 
       assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasNextPage"])
       assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasPreviousPage"])
@@ -130,12 +130,12 @@ describe GraphQL::Relay::ArrayConnection do
       |}
 
       it "applies to queries by `first`" do
-        result = query(query_string, "first" => 100)
+        result = star_wars_query(query_string, "first" => 100)
         assert_equal(["Yavin", "Echo Base"], get_names(result))
         assert_equal(true, get_page_info(result)["hasNextPage"])
 
         # Max page size is applied _without_ `first`, also
-        result = query(query_string)
+        result = star_wars_query(query_string)
         assert_equal(["Yavin", "Echo Base"], get_names(result))
         assert_equal(false, get_page_info(result)["hasNextPage"], "hasNextPage is false when first is not specified")
       end
@@ -143,20 +143,20 @@ describe GraphQL::Relay::ArrayConnection do
       it "applies to queries by `last`" do
         last_cursor = "Ng=="
         second_to_last_two_names = ["Death Star", "Shield Generator"]
-        result = query(query_string, "last" => 100, "before" => last_cursor)
+        result = star_wars_query(query_string, "last" => 100, "before" => last_cursor)
         assert_equal(second_to_last_two_names, get_names(result))
         assert_equal(true, get_page_info(result)["hasPreviousPage"])
 
-        result = query(query_string, "before" => last_cursor)
+        result = star_wars_query(query_string, "before" => last_cursor)
         assert_equal(second_to_last_two_names, get_names(result))
         assert_equal(false, get_page_info(result)["hasPreviousPage"], "hasPreviousPage is false when last is not specified")
 
         third_cursor = "Mw=="
         first_and_second_names = ["Yavin", "Echo Base"]
-        result = query(query_string, "last" => 100, "before" => third_cursor)
+        result = star_wars_query(query_string, "last" => 100, "before" => third_cursor)
         assert_equal(first_and_second_names, get_names(result))
 
-        result = query(query_string, "before" => third_cursor)
+        result = star_wars_query(query_string, "before" => third_cursor)
         assert_equal(first_and_second_names, get_names(result))
       end
     end

data/spec/graphql/relay/connection_type_spec.rb

@@ -24,7 +24,7 @@ describe GraphQL::Relay::ConnectionType do
       |}
 
       it "uses the custom edge and custom connection" do
-        result = query(query_string)
+        result = star_wars_query(query_string)
         bases = result["data"]["rebels"]["basesWithCustomEdge"]
         assert_equal 300, bases["totalCountTimes100"]
         assert_equal 'basesWithCustomEdge', bases["fieldName"]

data/spec/graphql/relay/global_node_identification_spec.rb

@@ -5,7 +5,7 @@ describe GraphQL::Relay::GlobalNodeIdentification do
   describe 'NodeField' do
     it 'finds objects by id' do
       global_id = node_identification.to_global_id("Faction", "1")
-      result = query(%|{
+      result = star_wars_query(%|{
         node(id: "#{global_id}") {
           id,
           ... on Faction {
@@ -107,7 +107,7 @@ describe GraphQL::Relay::GlobalNodeIdentification do
 
       describe "generating IDs" do
         it "Applies custom-defined ID generation" do
-          result = query(%| { largestBase { id } }|)
+          result = star_wars_query(%| { largestBase { id } }|)
           generated_id = result["data"]["largestBase"]["id"]
           assert_equal "Base/3", generated_id
         end
@@ -115,7 +115,7 @@ describe GraphQL::Relay::GlobalNodeIdentification do
 
       describe "fetching by ID" do
         it "Deconstructs the ID by the custom proc" do
-          result = query(%| { node(id: "Base/1") { ... on Base { name } } }|)
+          result = star_wars_query(%| { node(id: "Base/1") { ... on Base { name } } }|)
           base_name = result["data"]["node"]["name"]
           assert_equal "Yavin", base_name
         end
@@ -128,22 +128,4 @@ describe GraphQL::Relay::GlobalNodeIdentification do
       end
     end
   end
-
-  describe "type_from_object" do
-    describe "when the return value is nil" do
-      it "returns nil" do
-        result = node_identification.type_from_object(123)
-        assert_equal(nil, result)
-      end
-    end
-
-    describe "when the return value is not a BaseType" do
-      it "raises an error " do
-        err = assert_raises(RuntimeError) {
-          node_identification.type_from_object(:test_error)
-        }
-        assert_includes err.message, "not_a_type (Symbol)"
-      end
-    end
-  end
 end

data/spec/graphql/relay/mutation_spec.rb

@@ -26,7 +26,7 @@ describe GraphQL::Relay::Mutation do
   end
 
   it "returns the result & clientMutationId" do
-    result = query(query_string, "clientMutationId" => "1234")
+    result = star_wars_query(query_string, "clientMutationId" => "1234")
     expected = {"data" => {
       "introduceShip" => {
         "clientMutationId" => "1234",
@@ -43,7 +43,7 @@ describe GraphQL::Relay::Mutation do
   end
 
   it "doesn't require a clientMutationId to perform mutations" do
-    result = query(query_string)
+    result = star_wars_query(query_string)
     new_ship_name = result["data"]["introduceShip"]["shipEdge"]["node"]["name"]
     assert_equal("Bagel", new_ship_name)
   end

data/spec/graphql/relay/page_info_spec.rb

@@ -14,7 +14,7 @@ describe GraphQL::Relay::PageInfo do
   end
 
   let(:cursor_of_last_base) {
-    result = query(query_string, "first" => 100)
+    result = star_wars_query(query_string, "first" => 100)
     last_cursor = get_last_cursor(result)
   }
 
@@ -38,14 +38,14 @@ describe GraphQL::Relay::PageInfo do
 
   describe 'hasNextPage / hasPreviousPage' do
     it "hasNextPage is true if there are more items" do
-      result = query(query_string, "first" => 2)
+      result = star_wars_query(query_string, "first" => 2)
       assert_equal(true, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"], "hasPreviousPage is false if 'last' is missing")
       assert_equal("MQ==", get_page_info(result)["startCursor"])
       assert_equal("Mg==", get_page_info(result)["endCursor"])
 
       last_cursor = get_last_cursor(result)
-      result = query(query_string, "first" => 100, "after" => last_cursor)
+      result = star_wars_query(query_string, "first" => 100, "after" => last_cursor)
       assert_equal(false, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"])
       assert_equal("Mw==", get_page_info(result)["startCursor"])
@@ -53,13 +53,13 @@ describe GraphQL::Relay::PageInfo do
     end
 
     it "hasPreviousPage if there are more items" do
-      result = query(query_string, "last" => 100, "before" => cursor_of_last_base)
+      result = star_wars_query(query_string, "last" => 100, "before" => cursor_of_last_base)
       assert_equal(false, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"])
       assert_equal("MQ==", get_page_info(result)["startCursor"])
       assert_equal("Mg==", get_page_info(result)["endCursor"])
 
-      result = query(query_string, "last" => 1, "before" => cursor_of_last_base)
+      result = star_wars_query(query_string, "last" => 1, "before" => cursor_of_last_base)
       assert_equal(false, get_page_info(result)["hasNextPage"])
       assert_equal(true, get_page_info(result)["hasPreviousPage"])
       assert_equal("Mg==", get_page_info(result)["startCursor"])
@@ -67,7 +67,7 @@ describe GraphQL::Relay::PageInfo do
     end
 
     it "has both if first and last are present" do
-      result = query(query_string, "last" => 1, "first" => 1, "before" => cursor_of_last_base)
+      result = star_wars_query(query_string, "last" => 1, "first" => 1, "before" => cursor_of_last_base)
       assert_equal(true, get_page_info(result)["hasNextPage"])
       assert_equal(true, get_page_info(result)["hasPreviousPage"])
       assert_equal("Mg==", get_page_info(result)["startCursor"])
@@ -75,7 +75,7 @@ describe GraphQL::Relay::PageInfo do
     end
 
     it "startCursor and endCursor are the cursors of the first and last edge" do
-      result = query(query_string, "first" => 2)
+      result = star_wars_query(query_string, "first" => 2)
       assert_equal(true, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"])
       assert_equal("MQ==", get_page_info(result)["startCursor"])
@@ -83,7 +83,7 @@ describe GraphQL::Relay::PageInfo do
       assert_equal("MQ==", get_first_cursor(result))
       assert_equal("Mg==", get_last_cursor(result))
 
-      result = query(query_string, "first" => 1, "after" => get_page_info(result)["endCursor"])
+      result = star_wars_query(query_string, "first" => 1, "after" => get_page_info(result)["endCursor"])
       assert_equal(false, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"])
       assert_equal("Mw==", get_page_info(result)["startCursor"])
@@ -91,7 +91,7 @@ describe GraphQL::Relay::PageInfo do
       assert_equal("Mw==", get_first_cursor(result))
       assert_equal("Mw==", get_last_cursor(result))
 
-      result = query(query_string, "last" => 1, "before" => get_page_info(result)["endCursor"])
+      result = star_wars_query(query_string, "last" => 1, "before" => get_page_info(result)["endCursor"])
       assert_equal(false, get_page_info(result)["hasNextPage"])
       assert_equal(true, get_page_info(result)["hasPreviousPage"])
       assert_equal("Mg==", get_page_info(result)["startCursor"])

data/spec/graphql/relay/relation_connection_spec.rb

@@ -46,7 +46,7 @@ describe GraphQL::Relay::RelationConnection do
     |}
 
     it 'limits the result' do
-      result = query(query_string, "first" => 2)
+      result = star_wars_query(query_string, "first" => 2)
       assert_equal(2, get_names(result).length)
       assert_equal(true, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"])
@@ -55,7 +55,7 @@ describe GraphQL::Relay::RelationConnection do
       assert_equal("MQ==", get_first_cursor(result))
       assert_equal("Mg==", get_last_cursor(result))
 
-      result = query(query_string, "first" => 3)
+      result = star_wars_query(query_string, "first" => 3)
       assert_equal(3, get_names(result).length)
       assert_equal(false, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"])
@@ -66,7 +66,7 @@ describe GraphQL::Relay::RelationConnection do
     end
 
     it 'provides custom fields on the connection type' do
-      result = query(query_string, "first" => 2)
+      result = star_wars_query(query_string, "first" => 2)
       assert_equal(
         Base.where(faction_id: 2).count,
         result["data"]["empire"]["bases"]["totalCount"]
@@ -74,44 +74,44 @@ describe GraphQL::Relay::RelationConnection do
     end
 
     it 'slices the result' do
-      result = query(query_string, "first" => 2)
+      result = star_wars_query(query_string, "first" => 2)
       assert_equal(["Death Star", "Shield Generator"], get_names(result))
 
       # After the last result, find the next 2:
       last_cursor = get_last_cursor(result)
 
-      result = query(query_string, "after" => last_cursor, "first" => 2)
+      result = star_wars_query(query_string, "after" => last_cursor, "first" => 2)
       assert_equal(["Headquarters"], get_names(result))
 
       last_cursor = get_last_cursor(result)
 
-      result = query(query_string, "before" => last_cursor, "last" => 1)
+      result = star_wars_query(query_string, "before" => last_cursor, "last" => 1)
       assert_equal(["Shield Generator"], get_names(result))
 
-      result = query(query_string, "before" => last_cursor, "last" => 2)
+      result = star_wars_query(query_string, "before" => last_cursor, "last" => 2)
       assert_equal(["Death Star", "Shield Generator"], get_names(result))
 
-      result = query(query_string, "before" => last_cursor, "last" => 10)
+      result = star_wars_query(query_string, "before" => last_cursor, "last" => 10)
       assert_equal(["Death Star", "Shield Generator"], get_names(result))
 
     end
 
     it "applies custom arguments" do
-      result = query(query_string, "first" => 1, "nameIncludes" => "ea")
+      result = star_wars_query(query_string, "first" => 1, "nameIncludes" => "ea")
       assert_equal(["Death Star"], get_names(result))
 
       after = get_last_cursor(result)
 
-      result = query(query_string, "first" => 2, "nameIncludes" => "ea", "after" => after )
+      result = star_wars_query(query_string, "first" => 2, "nameIncludes" => "ea", "after" => after )
       assert_equal(["Headquarters"], get_names(result))
       before = get_last_cursor(result)
 
-      result = query(query_string, "last" => 1, "nameIncludes" => "ea", "before" => before)
+      result = star_wars_query(query_string, "last" => 1, "nameIncludes" => "ea", "before" => before)
       assert_equal(["Death Star"], get_names(result))
     end
 
     it 'works without first/last/after/before' do
-      result = query(query_string)
+      result = star_wars_query(query_string)
 
       assert_equal(3, result["data"]["empire"]["bases"]["edges"].length)
     end
@@ -143,12 +143,12 @@ describe GraphQL::Relay::RelationConnection do
       |}
 
       it "applies to queries by `first`" do
-        result = query(query_string, "first" => 100)
+        result = star_wars_query(query_string, "first" => 100)
         assert_equal(2, result["data"]["empire"]["bases"]["edges"].size)
         assert_equal(true, result["data"]["empire"]["bases"]["pageInfo"]["hasNextPage"])
 
         # Max page size is applied _without_ `first`, also
-        result = query(query_string)
+        result = star_wars_query(query_string)
         assert_equal(2, result["data"]["empire"]["bases"]["edges"].size)
         assert_equal(false, result["data"]["empire"]["bases"]["pageInfo"]["hasNextPage"], "hasNextPage is false when first is not specified")
       end
@@ -156,20 +156,20 @@ describe GraphQL::Relay::RelationConnection do
       it "applies to queries by `last`" do
         last_cursor = "Ng=="
         second_to_last_two_names = ["Death Star", "Shield Generator"]
-        result = query(query_string, "last" => 100, "before" => last_cursor)
+        result = star_wars_query(query_string, "last" => 100, "before" => last_cursor)
         assert_equal(second_to_last_two_names, get_names(result))
         assert_equal(true, result["data"]["empire"]["bases"]["pageInfo"]["hasPreviousPage"])
 
-        result = query(query_string, "before" => last_cursor)
+        result = star_wars_query(query_string, "before" => last_cursor)
         assert_equal(second_to_last_two_names, get_names(result))
         assert_equal(false, result["data"]["empire"]["bases"]["pageInfo"]["hasPreviousPage"], "hasPreviousPage is false when last is not specified")
 
         third_cursor = "Mw=="
         first_and_second_names = ["Yavin", "Echo Base"]
-        result = query(query_string, "last" => 100, "before" => third_cursor)
+        result = star_wars_query(query_string, "last" => 100, "before" => third_cursor)
         assert_equal(first_and_second_names, get_names(result))
 
-        result = query(query_string, "before" => third_cursor)
+        result = star_wars_query(query_string, "before" => third_cursor)
         assert_equal(first_and_second_names, get_names(result))
       end
     end
@@ -189,7 +189,7 @@ describe GraphQL::Relay::RelationConnection do
         }
     }|}
     it "uses default resolve" do
-      result = query(query_string)
+      result = star_wars_query(query_string)
       bases = result["data"]["empire"]["basesClone"]["edges"]
       assert_equal(3, bases.length)
     end
@@ -225,7 +225,7 @@ describe GraphQL::Relay::RelationConnection do
     end
 
     it "applies the default value" do
-      result = query(query_string)
+      result = star_wars_query(query_string)
       bases_by_id   = ["Death Star", "Shield Generator", "Headquarters"]
       bases_by_name = ["Death Star", "Headquarters", "Shield Generator"]
 
@@ -280,7 +280,7 @@ describe GraphQL::Relay::RelationConnection do
       |}
 
       it 'limits the result' do
-        result = query(query_string, "first" => 2)
+        result = star_wars_query(query_string, "first" => 2)
         assert_equal(2, get_names(result).length)
         assert_equal(true, get_page_info(result)["hasNextPage"])
         assert_equal(false, get_page_info(result)["hasPreviousPage"])
@@ -289,7 +289,7 @@ describe GraphQL::Relay::RelationConnection do
         assert_equal("MQ==", get_first_cursor(result))
         assert_equal("Mg==", get_last_cursor(result))
 
-        result = query(query_string, "first" => 3)
+        result = star_wars_query(query_string, "first" => 3)
         assert_equal(3, get_names(result).length)
         assert_equal(false, get_page_info(result)["hasNextPage"])
         assert_equal(false, get_page_info(result)["hasPreviousPage"])
@@ -300,7 +300,7 @@ describe GraphQL::Relay::RelationConnection do
       end
 
       it 'provides custom fields on the connection type' do
-        result = query(query_string, "first" => 2)
+        result = star_wars_query(query_string, "first" => 2)
         assert_equal(
           Base.where(faction_id: 2).count,
           result["data"]["empire"]["basesAsSequelDataset"]["totalCount"]
@@ -308,39 +308,39 @@ describe GraphQL::Relay::RelationConnection do
       end
 
       it 'slices the result' do
-        result = query(query_string, "first" => 2)
+        result = star_wars_query(query_string, "first" => 2)
         assert_equal(["Death Star", "Shield Generator"], get_names(result))
 
         # After the last result, find the next 2:
         last_cursor = get_last_cursor(result)
 
-        result = query(query_string, "after" => last_cursor, "first" => 2)
+        result = star_wars_query(query_string, "after" => last_cursor, "first" => 2)
         assert_equal(["Headquarters"], get_names(result))
 
         last_cursor = get_last_cursor(result)
 
-        result = query(query_string, "before" => last_cursor, "last" => 1)
+        result = star_wars_query(query_string, "before" => last_cursor, "last" => 1)
         assert_equal(["Shield Generator"], get_names(result))
 
-        result = query(query_string, "before" => last_cursor, "last" => 2)
+        result = star_wars_query(query_string, "before" => last_cursor, "last" => 2)
         assert_equal(["Death Star", "Shield Generator"], get_names(result))
 
-        result = query(query_string, "before" => last_cursor, "last" => 10)
+        result = star_wars_query(query_string, "before" => last_cursor, "last" => 10)
         assert_equal(["Death Star", "Shield Generator"], get_names(result))
 
       end
 
       it "applies custom arguments" do
-        result = query(query_string, "first" => 1, "nameIncludes" => "ea")
+        result = star_wars_query(query_string, "first" => 1, "nameIncludes" => "ea")
         assert_equal(["Death Star"], get_names(result))
 
         after = get_last_cursor(result)
 
-        result = query(query_string, "first" => 2, "nameIncludes" => "ea", "after" => after )
+        result = star_wars_query(query_string, "first" => 2, "nameIncludes" => "ea", "after" => after )
         assert_equal(["Headquarters"], get_names(result))
         before = get_last_cursor(result)
 
-        result = query(query_string, "last" => 1, "nameIncludes" => "ea", "before" => before)
+        result = star_wars_query(query_string, "last" => 1, "nameIncludes" => "ea", "before" => before)
         assert_equal(["Death Star"], get_names(result))
       end
     end