Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev/jet/mapd 645/rulecrud spec #650

Merged
merged 3 commits into from
Nov 11, 2015
Merged

Dev/jet/mapd 645/rulecrud spec #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5581fbd
sqlMock class and rulecrud tests
realtyjustin Nov 11, 2015
4ac7b05
Merge remote-tracking branch 'origin/master' into dev/jet/MAPD-645/ru…
realtyjustin Nov 11, 2015
a4c4326
removed longer toString query comparisons from rulecrud specs
realtyjustin Nov 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/services/service.dataSourceRules.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module.exports =
_putRules {data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType}, rules

deleteRules: (dataSourceId, dataSourceType, dataListType) ->
_deleteRules data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType
_deleteRules {data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType}

getListRules: (dataSourceId, dataSourceType, dataListType, list) ->
_getRules data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType, list: list
Expand All @@ -82,7 +82,7 @@ module.exports =
_putRules {data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType, list: list}, rules

deleteListRules: (dataSourceId, dataSourceType, dataListType, list) ->
_deleteRules data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType, list: list
_deleteRules {data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType, list: list}

getRule: (dataSourceId, dataSourceType, dataListType, list, ordering) ->
_getRules data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType, list: list, ordering: ordering
Expand All @@ -100,4 +100,4 @@ module.exports =
throw new PartiallyHandledError(error)

deleteRule: (dataSourceId, dataSourceType, dataListType, list, ordering) ->
_deleteRules data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType, list: list, ordering: ordering
_deleteRules {data_source_id: dataSourceId, data_source_type: dataSourceType, data_type: dataListType, list: list, ordering: ordering}
Loading