Skip to content

Commit

Permalink
Merge pull request #43 from alphagov/fix-merge-bork
Browse files Browse the repository at this point in the history
Fix merge breakage
  • Loading branch information
TheDoubleK committed May 28, 2015
2 parents 6f2f6d1 + 04f7ecf commit b9a9b91
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/test_apiclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,10 @@ def test_search_services_with_blank_query(self, search_client, rmock):
def test_search_services_with_pagination(self, search_client, rmock):
rmock.get(
'http://baseurl/g-cloud/services/search?page=10',
json={'search': "myresponse"},
json={'services': "myresponse"},
status_code=200)
result = search_client.search_services(q='', page=10)
assert result == "myresponse"
assert result == {'services': "myresponse"}
assert rmock.last_request.query == 'page=10'

@staticmethod
Expand Down

0 comments on commit b9a9b91

Please sign in to comment.