		`@@ -311,7 +311,9 @@`
		`"c",`
		`"wait",`
		`"dashboard",`
		`- "docs/, tickets/, requests/*",`
		`+ "docs/*",`
		`+ "tickets/*",`
		`+ "requests/*",`
		`]`
jlanda commented 4 years ago Good catch. I needed some time to realize that you were not just putting an argument on each line Edited 4 years ago by jlanda
pingou commented 4 years ago The commit message helps on this one ;-)

		`# List of prefix allowed in project names`

		`@@ -1621,14 +1621,6 @@`

		`Is an async operation, and returns task ID.`
		`"""`
		`- ns_name = name if not namespace else "%s/%s" % (namespace, name)`
		`- matched = any(map(functools.partial(fnmatch.fnmatch, ns_name), blacklist))`
		`- if matched:`
		`- raise pagure.exceptions.ProjectBlackListedException(`
		`- 'No project "%s" are allowed to be created due to potential '`
		`- "conflicts in URLs with pagure itself" % ns_name`
		`- )`
		`-`
		`user_obj = get_user(session, user)`
		`allowed_prefix = allowed_prefix + [grp for grp in user_obj.groups]`
		`if user_ns:`
		`@@ -1646,6 +1638,15 @@`
		`"name of a group of which you are a member."`
		`)`

		`+ path = name if not namespace else "%s/%s" % (namespace, name)`
		`+`
		`+ matched = any(map(functools.partial(fnmatch.fnmatch, path), blacklist))`
		`+ if matched:`
		`+ raise pagure.exceptions.ProjectBlackListedException(`
		`+ 'No project "%s" are allowed to be created due to potential '`
		`+ "conflicts in URLs with pagure itself" % path`
		`+ )`
		`+`
		`if len(name) == 40 and prevent_40_chars:`
		`# We must block project with a name <foo>/<bar> where the length`
		`# of <bar> is exactly 40 characters long as this would otherwise`
		`@@ -1658,10 +1659,6 @@`
		"the `/`"
		`)`

		`- path = name`
		`- if namespace:`
		`- path = "%s/%s" % (namespace, name)`
		`-`
		`# Repo exists in the DB`
		`repo = _get_project(session, name, namespace=namespace)`
		`# this is leaking private repos but we're leaking them anyway if we fail`

		`@@ -240,31 +240,30 @@`
		`}`


		`- def _populate_db(session):`
		`- # Create a couple of users`
		`- item = pagure.lib.model.User(`
		`- user="pingou",`
		`- fullname="PY C",`
		`+ def create_user(session, username, fullname, emails):`
		`+ """ Create an user with the provided information.`
		+ Note that `emails` should be a list of emails.
		`+ """`
		`+ user = pagure.lib.model.User(`
		`+ user=username,`
		`+ fullname=fullname,`
		`password=b"foo",`
		`- default_email="bar@pingou.com",`
		`+ default_email=emails[0],`
		`)`
		`- session.add(item)`
		`- item = pagure.lib.model.UserEmail(user_id=1, email="bar@pingou.com")`
		`- session.add(item)`
		`- item = pagure.lib.model.UserEmail(user_id=1, email="foo@pingou.com")`
		`- session.add(item)`
		`+ session.add(user)`
		`+ session.flush()`
		`+ for email in emails:`
		`+ item = pagure.lib.model.UserEmail(user_id=user.id, email=email)`
		`+ session.add(item)`
		`+ session.commit()`

		`- item = pagure.lib.model.User(`
		`- user="foo",`
		`- fullname="foo bar",`
		`- password=b"foo",`
		`- default_email="foo@bar.com",`
		`- )`
		`- session.add(item)`
		`- item = pagure.lib.model.UserEmail(user_id=2, email="foo@bar.com")`
		`- session.add(item)`

		`- session.commit()`
		`+ def _populate_db(session):`
		`+ # Create a couple of users`
		`+ create_user(`
		`+ session, "pingou", "PY C", ["bar@pingou.com", "foo@pingou.com"]`
		`+ )`
		`+ create_user(session, "foo", "foo bar", ["foo@bar.com"])`


		`def store_eager_results(args, *kwargs):`

		`@@ -1568,7 +1568,7 @@`
		`name="static",`
		`repospanner_region=None,`
		`blacklist=["space/*"],`
		`- allowed_prefix=[],`
		`+ allowed_prefix=["space"],`
		`description="description for static",`
		`parent_id=None,`
		`)`

		`@@ -180,193 +180,269 @@`
		`output_text,`
		`)`

		`- @patch.dict("pagure.config.config", {"ENABLE_UI_NEW_PROJECTS": False})`
		`- def test_new_project_when_turned_off_in_the_ui(self):`
		`- """ Test the new_project endpoint when new project creation is`
		`- not allowed in the UI of this pagure instance. """`
		`+ @patch.dict(`
		`+ "pagure.config.config",`
		`+ {`
		`+ "PAGURE_ADMIN_USERS": ["pingou"],`
		`+ "ALLOW_ADMIN_IGNORE_EXISTING_REPOS": True,`
		`+ },`
		`+ )`
		`+ def test_adopt_repos(self):`
		`+ """ Test the new_project endpoint with existing git repo. """`
		`+ # Before`
		`+ projects = pagure.lib.query.search_projects(self.session)`
		`+ self.assertEqual(len(projects), 0)`
		`+ tests.create_projects_git(os.path.join(self.path, "repos"), bare=True)`
		`+ tests.add_content_git_repo(`
		`+ os.path.join(self.path, "repos", "test.git")`
		`+ )`

		`- user = tests.FakeUser(username="foo")`
		`+ user = tests.FakeUser(username="pingou")`
		`with tests.user_set(self.app.application, user):`
		`- output = self.app.get("/new/")`
		`- self.assertEqual(output.status_code, 404)`
		`-`
		`- data = {"description": "Project #1", "name": "project-1"}`
		`+ data = {`
		`+ "csrf_token": self.get_csrf(),`
		`+ "name": "test",`
		`+ "description": "Project #1",`
		`+ }`

		`output = self.app.post("/new/", data=data, follow_redirects=True)`
		`- self.assertEqual(output.status_code, 404)`