Refactor filter data test to fit 'or' tags statement

tests/integration/test_issues.py

@@ -523,7 +523,7 @@ def test_api_filters_data(client):
  assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 4
  assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 3
 
- assert next(filter(lambda i: i['id'] == None, response.data["assigned_to"]))["count"] == 4
+ assert next(filter(lambda i: i['id'] is None, response.data["assigned_to"]))["count"] == 4
  assert next(filter(lambda i: i['id'] == user1.id, response.data["assigned_to"]))["count"] == 3
  assert next(filter(lambda i: i['id'] == user2.id, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user3.id, response.data["assigned_to"]))["count"] == 1
@@ -559,7 +559,7 @@ def test_api_filters_data(client):
  assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 1
 
- assert next(filter(lambda i: i['id'] == None, response.data["assigned_to"]))["count"] == 1
+ assert next(filter(lambda i: i['id'] is None, response.data["assigned_to"]))["count"] == 1
  assert next(filter(lambda i: i['id'] == user1.id, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user2.id, response.data["assigned_to"]))["count"] == 1
  assert next(filter(lambda i: i['id'] == user3.id, response.data["assigned_to"]))["count"] == 0
@@ -591,37 +591,37 @@ def test_api_filters_data(client):
  response = client.get(url + "&tags={},{}&owner={},{}".format(tag1, tag2, user1.id, user2.id))
  assert response.status_code == 200
 
- assert next(filter(lambda i: i['id'] == user1.id, response.data["owners"]))["count"] == 1
- assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 1
- assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 1
+ assert next(filter(lambda i: i['id'] == user1.id, response.data["owners"]))["count"] == 2
+ assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 2
+ assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 2
 
- assert next(filter(lambda i: i['id'] == None, response.data["assigned_to"]))["count"] == 0
+ assert next(filter(lambda i: i['id'] is None, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user1.id, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user2.id, response.data["assigned_to"]))["count"] == 0
  assert next(filter(lambda i: i['id'] == user3.id, response.data["assigned_to"]))["count"] == 0
 
  assert next(filter(lambda i: i['id'] == status0.id, response.data["statuses"]))["count"] == 1
  assert next(filter(lambda i: i['id'] == status1.id, response.data["statuses"]))["count"] == 0
  assert next(filter(lambda i: i['id'] == status2.id, response.data["statuses"]))["count"] == 0
- assert next(filter(lambda i: i['id'] == status3.id, response.data["statuses"]))["count"] == 1
+ assert next(filter(lambda i: i['id'] == status3.id, response.data["statuses"]))["count"] == 3
 
- assert next(filter(lambda i: i['id'] == type1.id, response.data["types"]))["count"] == 2
- assert next(filter(lambda i: i['id'] == type2.id, response.data["types"]))["count"] == 0
+ assert next(filter(lambda i: i['id'] == type1.id, response.data["types"]))["count"] == 3
+ assert next(filter(lambda i: i['id'] == type2.id, response.data["types"]))["count"] == 1
 
  assert next(filter(lambda i: i['id'] == priority0.id, response.data["priorities"]))["count"] == 0
  assert next(filter(lambda i: i['id'] == priority1.id, response.data["priorities"]))["count"] == 0
- assert next(filter(lambda i: i['id'] == priority2.id, response.data["priorities"]))["count"] == 2
+ assert next(filter(lambda i: i['id'] == priority2.id, response.data["priorities"]))["count"] == 4
  assert next(filter(lambda i: i['id'] == priority3.id, response.data["priorities"]))["count"] == 0
 
  assert next(filter(lambda i: i['id'] == severity0.id, response.data["severities"]))["count"] == 1
- assert next(filter(lambda i: i['id'] == severity1.id, response.data["severities"]))["count"] == 0
+ assert next(filter(lambda i: i['id'] == severity1.id, response.data["severities"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == severity2.id, response.data["severities"]))["count"] == 0
  assert next(filter(lambda i: i['id'] == severity3.id, response.data["severities"]))["count"] == 1
 
- assert next(filter(lambda i: i['name'] == tag0, response.data["tags"]))["count"] == 0
- assert next(filter(lambda i: i['name'] == tag1, response.data["tags"]))["count"] == 2
- assert next(filter(lambda i: i['name'] == tag2, response.data["tags"]))["count"] == 2
- assert next(filter(lambda i: i['name'] == tag3, response.data["tags"]))["count"] == 1
+ assert next(filter(lambda i: i['name'] == tag0, response.data["tags"]))["count"] == 1
+ assert next(filter(lambda i: i['name'] == tag1, response.data["tags"]))["count"] == 3
+ assert next(filter(lambda i: i['name'] == tag2, response.data["tags"]))["count"] == 3
+ assert next(filter(lambda i: i['name'] == tag3, response.data["tags"]))["count"] == 3
 
 
 def test_get_invalid_csv(client):

tests/integration/test_tasks.py

@@ -913,7 +913,7 @@ def test_api_filters_data(client):
  assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 4
  assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 3
 
- assert next(filter(lambda i: i['id'] == None, response.data["assigned_to"]))["count"] == 4
+ assert next(filter(lambda i: i['id'] is None, response.data["assigned_to"]))["count"] == 4
  assert next(filter(lambda i: i['id'] == user1.id, response.data["assigned_to"]))["count"] == 3
  assert next(filter(lambda i: i['id'] == user2.id, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user3.id, response.data["assigned_to"]))["count"] == 1
@@ -936,7 +936,7 @@ def test_api_filters_data(client):
  assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 3
  assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 1
 
- assert next(filter(lambda i: i['id'] == None, response.data["assigned_to"]))["count"] == 3
+ assert next(filter(lambda i: i['id'] is None, response.data["assigned_to"]))["count"] == 3
  assert next(filter(lambda i: i['id'] == user1.id, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user2.id, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user3.id, response.data["assigned_to"]))["count"] == 0
@@ -955,24 +955,24 @@ def test_api_filters_data(client):
  response = client.get(url + "&tags={},{}&owner={},{}".format(tag1, tag2, user1.id, user2.id))
  assert response.status_code == 200
 
- assert next(filter(lambda i: i['id'] == user1.id, response.data["owners"]))["count"] == 1
- assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 1
- assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 1
+ assert next(filter(lambda i: i['id'] == user1.id, response.data["owners"]))["count"] == 2
+ assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 2
+ assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 2
 
- assert next(filter(lambda i: i['id'] == None, response.data["assigned_to"]))["count"] == 0
+ assert next(filter(lambda i: i['id'] is None, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user1.id, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user2.id, response.data["assigned_to"]))["count"] == 0
  assert next(filter(lambda i: i['id'] == user3.id, response.data["assigned_to"]))["count"] == 0
 
  assert next(filter(lambda i: i['id'] == status0.id, response.data["statuses"]))["count"] == 1
  assert next(filter(lambda i: i['id'] == status1.id, response.data["statuses"]))["count"] == 0
  assert next(filter(lambda i: i['id'] == status2.id, response.data["statuses"]))["count"] == 0
- assert next(filter(lambda i: i['id'] == status3.id, response.data["statuses"]))["count"] == 1
+ assert next(filter(lambda i: i['id'] == status3.id, response.data["statuses"]))["count"] == 3
 
- assert next(filter(lambda i: i['name'] == tag0, response.data["tags"]))["count"] == 0
- assert next(filter(lambda i: i['name'] == tag1, response.data["tags"]))["count"] == 2
- assert next(filter(lambda i: i['name'] == tag2, response.data["tags"]))["count"] == 2
- assert next(filter(lambda i: i['name'] == tag3, response.data["tags"]))["count"] == 1
+ assert next(filter(lambda i: i['name'] == tag0, response.data["tags"]))["count"] == 1
+ assert next(filter(lambda i: i['name'] == tag1, response.data["tags"]))["count"] == 3
+ assert next(filter(lambda i: i['name'] == tag2, response.data["tags"]))["count"] == 3
+ assert next(filter(lambda i: i['name'] == tag3, response.data["tags"]))["count"] == 3
 
 
 def test_api_validator_assigned_to_when_update_tasks(client):

tests/integration/test_userstories.py

@@ -915,27 +915,27 @@ def test_api_filters_data(client):
  response = client.get(url + "&tags={},{}&owner={},{}".format(tag1, tag2, user1.id, user2.id))
  assert response.status_code == 200
 
- assert next(filter(lambda i: i['id'] == user1.id, response.data["owners"]))["count"] == 1
- assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 1
- assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 1
+ assert next(filter(lambda i: i['id'] == user1.id, response.data["owners"]))["count"] == 2
+ assert next(filter(lambda i: i['id'] == user2.id, response.data["owners"]))["count"] == 2
+ assert next(filter(lambda i: i['id'] == user3.id, response.data["owners"]))["count"] == 2
 
- assert next(filter(lambda i: i['id'] is None, response.data["assigned_to"]))["count"] == 0
+ assert next(filter(lambda i: i['id'] is None, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user1.id, response.data["assigned_to"]))["count"] == 2
  assert next(filter(lambda i: i['id'] == user2.id, response.data["assigned_to"]))["count"] == 0
  assert next(filter(lambda i: i['id'] == user3.id, response.data["assigned_to"]))["count"] == 0
 
  assert next(filter(lambda i: i['id'] == status0.id, response.data["statuses"]))["count"] == 1
  assert next(filter(lambda i: i['id'] == status1.id, response.data["statuses"]))["count"] == 0
  assert next(filter(lambda i: i['id'] == status2.id, response.data["statuses"]))["count"] == 0
- assert next(filter(lambda i: i['id'] == status3.id, response.data["statuses"]))["count"] == 1
+ assert next(filter(lambda i: i['id'] == status3.id, response.data["statuses"]))["count"] == 3
 
- assert next(filter(lambda i: i['name'] == tag0, response.data["tags"]))["count"] == 0
- assert next(filter(lambda i: i['name'] == tag1, response.data["tags"]))["count"] == 2
- assert next(filter(lambda i: i['name'] == tag2, response.data["tags"]))["count"] == 2
- assert next(filter(lambda i: i['name'] == tag3, response.data["tags"]))["count"] == 1
+ assert next(filter(lambda i: i['name'] == tag0, response.data["tags"]))["count"] == 1
+ assert next(filter(lambda i: i['name'] == tag1, response.data["tags"]))["count"] == 3
+ assert next(filter(lambda i: i['name'] == tag2, response.data["tags"]))["count"] == 3
+ assert next(filter(lambda i: i['name'] == tag3, response.data["tags"]))["count"] == 3
 
- assert next(filter(lambda i: i['id'] is None, response.data["epics"]))["count"] == 0
- assert next(filter(lambda i: i['id'] == epic0.id, response.data["epics"]))["count"] == 2
+ assert next(filter(lambda i: i['id'] is None, response.data["epics"]))["count"] == 1
+ assert next(filter(lambda i: i['id'] == epic0.id, response.data["epics"]))["count"] == 3
  assert next(filter(lambda i: i['id'] == epic1.id, response.data["epics"]))["count"] == 0
  assert next(filter(lambda i: i['id'] == epic2.id, response.data["epics"]))["count"] == 1