rename ProductFiltersService to ProductFiltersUrl

This commit is contained in:
Gaetan Riou
2020-08-21 12:13:16 +10:00
parent f71013c514
commit 6564ea7b00
4 changed files with 18 additions and 18 deletions

View File

@@ -246,7 +246,7 @@ describe "filtering products for submission to database", ->
]
describe "AdminProductEditCtrl", ->
$ctrl = $scope = $timeout = $httpBackend = BulkProducts = DirtyProducts = DisplayProperties = ProductFiltersService = windowStub = null
$ctrl = $scope = $timeout = $httpBackend = BulkProducts = DirtyProducts = DisplayProperties = ProductFiltersUrl = windowStub = null
beforeEach ->
module "ofn.admin"
@@ -258,7 +258,7 @@ describe "AdminProductEditCtrl", ->
$provide.value 'columns', []
null
beforeEach inject((_$controller_, _$timeout_, $rootScope, _$httpBackend_, _BulkProducts_, _DirtyProducts_, _DisplayProperties_, _ProductFiltersService_) ->
beforeEach inject((_$controller_, _$timeout_, $rootScope, _$httpBackend_, _BulkProducts_, _DirtyProducts_, _DisplayProperties_, _ProductFiltersUrl_) ->
$scope = $rootScope.$new()
$ctrl = _$controller_
$timeout = _$timeout_
@@ -266,7 +266,7 @@ describe "AdminProductEditCtrl", ->
BulkProducts = _BulkProducts_
DirtyProducts = _DirtyProducts_
DisplayProperties = _DisplayProperties_
ProductFiltersService = _ProductFiltersService_
ProductFiltersUrl = _ProductFiltersUrl_
# Stub the window object so we don't get redirected when href is updated
windowStub = {navigator: {userAgent: 'foo'}, location: {href: ''}}

View File

@@ -1,24 +1,24 @@
describe "ProductFiltersService service", ->
ProductFiltersService = null
describe "ProductFiltersUrl service", ->
ProductFiltersUrl = null
beforeEach ->
module "ofn.admin"
beforeEach inject (_ProductFiltersService_) ->
ProductFiltersService = _ProductFiltersService_
beforeEach inject (_ProductFiltersUrl_) ->
ProductFiltersUrl = _ProductFiltersUrl_
describe "loadFromUrl", ->
it "should return a hash with value populated for filters existing in parameter", ->
producerFilter = 2
query = 'fruit'
filters = ProductFiltersService.loadFromUrl(producerFilter: producerFilter, query: query)
filters = ProductFiltersUrl.loadFromUrl(producerFilter: producerFilter, query: query)
expect(filters.producerFilter).toBe producerFilter
expect(filters.query).toBe query
it "should return a hash with empty value for filters missing from parameter", ->
filters = ProductFiltersService.loadFromUrl({})
filters = ProductFiltersUrl.loadFromUrl({})
expect(filters.producerFilter).toBe ""
expect(filters.query).toBe ""
@@ -31,7 +31,7 @@ describe "ProductFiltersService service", ->
producerFilter = 2
query = 'fruit'
filters = ProductFiltersService.generate(
filters = ProductFiltersUrl.generate(
producerFilter: producerFilter, query: query, otherParam: 'otherParam'
)
@@ -55,7 +55,7 @@ describe "ProductFiltersService service", ->
}
baseUrl = "openfoodnetwork.org.au"
url = ProductFiltersService.buildUrl(baseUrl, filters)
url = ProductFiltersUrl.buildUrl(baseUrl, filters)
expectedFilters = $httpParamSerializer(filters)
expect(url).toBe("#{baseUrl}?#{expectedFilters}")
@@ -63,6 +63,6 @@ describe "ProductFiltersService service", ->
it 'should return baseUrl if filters are empty', ->
baseUrl = "openfoodnetwork.org.au"
url = ProductFiltersService.buildUrl(baseUrl, {})
url = ProductFiltersUrl.buildUrl(baseUrl, {})
expect(url).toBe baseUrl