Skip to content

Commit

Permalink
fic(queries): Rename multiQueries => multipleQueries (#461)
Browse files Browse the repository at this point in the history
Closes #448
  • Loading branch information
ElPicador committed Feb 13, 2018
1 parent f6ad92c commit fc60a3c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
10 changes: 10 additions & 0 deletions src/main/scala/algolia/definitions/MultiQueriesDefinition.scala
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,24 @@ trait MultiQueriesDefinitionDsl {

implicit val formats: Formats

@deprecated("use multipleQueries", "1.27.1")
def multiQueries(queries: Traversable[SearchDefinition]): MultiQueriesDefinition = {
MultiQueriesDefinition(queries)
}

@deprecated("use multipleQueries", "1.27.1")
def multiQueries(queries: SearchDefinition*): MultiQueriesDefinition = {
MultiQueriesDefinition(queries)
}

def multipleQueries(queries: Traversable[SearchDefinition]): MultiQueriesDefinition = {
MultiQueriesDefinition(queries)
}

def multipleQueries(queries: SearchDefinition*): MultiQueriesDefinition = {
MultiQueriesDefinition(queries)
}

implicit object MultiQueriesExecutable
extends Executable[MultiQueriesDefinition, MultiQueriesResult] {
override def apply(client: AlgoliaClient, query: MultiQueriesDefinition)(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ import algolia.AlgoliaTest
import algolia.http._
import algolia.objects.{MultiQueries, Query}

class MultiQueriesTest extends AlgoliaTest {
class MultipleQueriesTest extends AlgoliaTest {

describe("multi queries") {
describe("multiple queries") {

it("should do multi queries") {
multiQueries(
it("should do multiple queries") {
multipleQueries(
search into "indexName" query Query(),
search into "indexName2" query Query()
) strategy MultiQueries.Strategy.stopIfEnoughMatches
}

it("should call the API") {
val m = multiQueries(
val m = multipleQueries(
search into "indexName1" query Query(query = Some("a")),
search into "indexName2" query Query(query = Some("b"))
) strategy MultiQueries.Strategy.stopIfEnoughMatches
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ class SearchIntegrationTest extends AlgoliaTest {
}
}

describe("multi queries") {
describe("multiple queries") {

it("should return generic object") {
val s = client.execute {
multiQueries(
multipleQueries(
search into indexName query Query(query = Some("a")),
search into "indexToSearch2" query Query(query = Some("a"))
)
Expand All @@ -163,7 +163,7 @@ class SearchIntegrationTest extends AlgoliaTest {

it("should return case class") {
val s = client.execute {
multiQueries(
multipleQueries(
search into indexName query Query(query = Some("a")),
search into "indexToSearch2" query Query(query = Some("a"))
)
Expand All @@ -180,7 +180,7 @@ class SearchIntegrationTest extends AlgoliaTest {

it("should return a hit") {
val s = client.execute {
multiQueries(
multipleQueries(
search into indexName query Query(query = Some("a")),
search into "indexToSearch2" query Query(query = Some("a"))
)
Expand Down

0 comments on commit fc60a3c

Please sign in to comment.