[admin] delete user from grid

admin/acceptance_tests/user_test.py

@@ -1,5 +1,6 @@
 import pytest
 from pyramid.testing import DummyRequest
+from selenium.common.exceptions import NoSuchElementException
 
 
 @pytest.fixture(scope='class')
@@ -48,6 +49,21 @@ def test_view_edit(self, dbsession, test_app):
             ('secretary_3', False, 'secretary_3')]
         assert resp.form['role_name'].value == user.role_name
 
+    def test_delete_success(self, dbsession):
+        from c2cgeoportal_commons.models.main import User
+        user_id = dbsession.query(User). \
+            filter(User.username == 'babar_9'). \
+            one().id
+        from c2cgeoportal_admin.views.users import UserViews
+        req = DummyRequest(dbsession=dbsession)
+        req.referer = 'this is a test, TestUser-test_delete'
+        req.matchdict.update({'id': str(user_id)})
+
+        UserViews(req).delete()
+
+        user = dbsession.query(User).filter(User.id == user_id).one_or_none()
+        assert user is None
+
     @pytest.mark.usefixtures("test_app")  # route have to be registred for HTTP_FOUND
     def test_submit_update(self, dbsession, test_app):
         from c2cgeoportal_commons.models.main import User
@@ -150,3 +166,39 @@ def test_selenium(self, dbsession, selenium):
         dbsession.expire(user)
         assert user.username == 'new_name_éôù'
         assert user.email == 'new_email'
+
+    # in order to make this work, had to install selenium gecko driver
+    @pytest.mark.usefixtures("selenium", "selenium_app")
+    def test_delete_selenium(self, dbsession, selenium):
+        from c2cgeoportal_commons.models.main import User
+        user_id = dbsession.query(User). \
+            filter(User.username == 'babar_13'). \
+            one().id
+        selenium.get('http://127.0.0.1:6543' + '/user/')
+        elem = selenium.find_element_by_xpath("//div[@class='infos']")
+        assert 'Showing 1 to 10 of 23 entries' == elem.text
+        main_window_handle = selenium.current_window_handle
+        elem = selenium.find_element_by_xpath("//button[@title='Refresh']/following-sibling::*")
+        elem.click()
+        elem = selenium.find_element_by_xpath("//a[contains(.,'50')]")
+        elem.click()
+        elem = selenium.find_element_by_xpath("//a[contains(@href,'" +
+                                              str(user_id) +
+                                              "/edit')]/following-sibling::*")
+        elem.click()
+        selenium.switch_to_alert().accept()
+
+        selenium.switch_to_default_content()
+        selenium.refresh()
+        elem = selenium.find_element_by_xpath("//div[@class='infos']")
+        assert 'Showing 1 to 10 of 22 entries' == elem.text
+        elem = selenium.find_element_by_xpath("//button[@title='Refresh']/following-sibling::*")
+        elem.click()
+        elem = selenium.find_element_by_xpath("//a[contains(.,'50')]")
+        elem.click()
+        try:
+            assert None == selenium.find_element_by_xpath("//a[contains(@href,'" +
+                                              str(user_id) +
+                                              "/edit')]/following-sibling::*")
+        except NoSuchElementException:
+            pass

admin/c2cgeoportal_admin/views/roles.py

@@ -35,3 +35,7 @@ def view(self):
                  renderer="../templates/edit.jinja2")
     def save(self):
         return super().save()
+
+    @view_config(route_name='c2cgeoform_delete')
+    def delete(self):
+        return super().delete()

admin/c2cgeoportal_admin/views/users.py

@@ -35,3 +35,7 @@ def view(self):
                  renderer="../templates/edit.jinja2")
     def save(self):
         return super().save()
+
+    @view_config(route_name='c2cgeoform_delete')
+    def delete(self):
+        return super().delete()

admin/requirements.txt

@@ -1 +1 @@
--e git://github.com/camptocamp/c2cgeoform.git@9718b29415707d08fecfdced62cb165a64826f2e#egg=c2cgeoform
+-e git://github.com/camptocamp/c2cgeoform.git@123561e963e43b765040e973c92599159cbd2170#egg=c2cgeoform

commons/requirements.txt

@@ -1 +1 @@
--e git://github.com/camptocamp/c2cgeoform.git@87a4191ef3330b76497bd009e9c0220cbc73c625#egg=c2cgeoform
+-e git://github.com/camptocamp/c2cgeoform.git@123561e963e43b765040e973c92599159cbd2170#egg=c2cgeoform