From 5617de891e8a9295ddff43c595e876d995ac5a7d Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.be>
Date: Wed, 15 Oct 2014 20:25:43 +0200
Subject: [PATCH] Move some userstories test to right location.

---
 tests/integration/test_project_us.py  | 49 ---------------------------
 tests/integration/test_userstories.py | 23 +++++++++++++
 2 files changed, 23 insertions(+), 49 deletions(-)
 delete mode 100644 tests/integration/test_project_us.py

diff --git a/tests/integration/test_project_us.py b/tests/integration/test_project_us.py
deleted file mode 100644
index 65abf3dc..00000000
--- a/tests/integration/test_project_us.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (C) 2014 Andrey Antukh <niwi@niwi.be>
-# Copyright (C) 2014 Jesús Espino <jespinog@gmail.com>
-# Copyright (C) 2014 David Barragán <bameda@dbarragan.com>
-# Copyright (C) 2014 Anler Hernández <hello@anler.me>
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import pytest
-from django.core.urlresolvers import reverse
-
-from taiga.base.utils import json
-from .. import factories as f
-
-
-pytestmark = pytest.mark.django_db
-
-
-def test_archived_filter(client):
-    user = f.UserFactory.create()
-    project = f.ProjectFactory.create(owner=user)
-    f.MembershipFactory.create(project=project, user=user)
-    f.UserStoryFactory.create(project=project)
-    f.UserStoryFactory.create(is_archived=True, project=project)
-
-    client.login(user)
-
-    url = reverse("userstories-list")
-
-    data = {}
-    response = client.get(url, data)
-    assert len(json.loads(response.content)) == 2
-
-    data = {"is_archived": 0}
-    response = client.get(url, data)
-    assert len(json.loads(response.content)) == 1
-
-    data = {"is_archived": 1}
-    response = client.get(url, data)
-    assert len(json.loads(response.content)) == 1
diff --git a/tests/integration/test_userstories.py b/tests/integration/test_userstories.py
index 61d31535..fc1d31e5 100644
--- a/tests/integration/test_userstories.py
+++ b/tests/integration/test_userstories.py
@@ -155,3 +155,26 @@ def test_update_userstory_points(client):
     assert rp == [(role1.pk, points3.pk), (role2.pk, points1.pk)]
 
 
+def test_archived_filter(client):
+    user = f.UserFactory.create()
+    project = f.ProjectFactory.create(owner=user)
+    f.MembershipFactory.create(project=project, user=user)
+    f.UserStoryFactory.create(project=project)
+    f.UserStoryFactory.create(is_archived=True, project=project)
+
+    client.login(user)
+
+    url = reverse("userstories-list")
+
+    data = {}
+    response = client.get(url, data)
+    assert len(json.loads(response.content)) == 2
+
+    data = {"is_archived": 0}
+    response = client.get(url, data)
+    assert len(json.loads(response.content)) == 1
+
+    data = {"is_archived": 1}
+    response = client.get(url, data)
+    assert len(json.loads(response.content)) == 1
+