Switch to unified view

a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
...
...
232
        r = self.app.get('/p/test/admin/overview')
232
        r = self.app.get('/p/test/admin/overview')
233
        assert 'This project has been deleted and is not visible to non-admin users' not in r
233
        assert 'This project has been deleted and is not visible to non-admin users' not in r
234
        assert r.html.find('input',{'name':'removal','value':''}).has_key('checked')
234
        assert r.html.find('input',{'name':'removal','value':''}).has_key('checked')
235
        assert not r.html.find('input',{'name':'removal','value':'deleted'}).has_key('checked')
235
        assert not r.html.find('input',{'name':'removal','value':'deleted'}).has_key('checked')
236
236
237
    def test_project_delete_not_allowed(self):
238
        # turn off project delete option
239
        from allura.ext.admin.admin_main import config
240
        config['allow_project_delete'] = False
241
        # create a subproject
242
        self.app.post('/admin/update_mounts', params={
243
                'new.install':'install',
244
                'new.ep_name':'',
245
                'new.ordinal':1,
246
                'new.mount_point':'sub1',
247
                'new.mount_label':'sub1'})
248
        # root project doesn't have delete option
249
        r = self.app.get('/p/test/admin/overview')
250
        assert not r.html.find('input',{'name':'removal','value':'deleted'})
251
        # subprojects can still be deleted
252
        r = self.app.get('/p/test/sub1/admin/overview')
253
        assert r.html.find('input',{'name':'removal','value':'deleted'})
254
        # attempt to delete root project won't do anything
255
        self.app.post('/admin/update', params=dict(
256
                name='Test Project',
257
                shortname='test',
258
                removal='deleted',
259
                short_description='A Test Project',
260
                delete='on'))
261
        r = self.app.get('/p/test/admin/overview')
262
        assert 'This project has been deleted and is not visible to non-admin users' not in r
263
        # make sure subproject delete works
264
        self.app.post('/p/test/sub1/admin/update', params=dict(
265
                name='sub1',
266
                shortname='sub1',
267
                removal='deleted',
268
                short_description='A Test Project',
269
                delete='on'))
270
        r = self.app.get('/p/test/sub1/admin/overview')
271
        assert 'This project has been deleted and is not visible to non-admin users' in r
272
        assert r.html.find('input',{'name':'removal','value':'deleted'}).has_key('checked')
273
237
    def test_add_remove_trove_cat(self):
274
    def test_add_remove_trove_cat(self):
238
        r = self.app.get('/admin/trove')
275
        r = self.app.get('/admin/trove')
239
        assert 'No Database Environment categories have been selected.' in r
276
        assert 'No Database Environment categories have been selected.' in r
240
        assert '<span class="trove_fullpath">Database Environment :: Database API</span>' not in r
277
        assert '<span class="trove_fullpath">Database Environment :: Database API</span>' not in r
241
        # add a cat
278
        # add a cat