Mercurial > kallithea

comparison rhodecode/tests/api/api_base.py @ 3215:cbc63abe7d59 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed tests
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 24 Jan 2013 00:45:51 +0100
parents e1baadec6217
children 81bbb8086f03
comparison
equal deleted inserted replaced
3214:54a596abfa65 3215:cbc63abe7d59
537 537
538 repo = RepoModel().get_by_repo_name(self.REPO) 538 repo = RepoModel().get_by_repo_name(self.REPO)
539 ret = repo.get_api_data() 539 ret = repo.get_api_data()
540 540
541 members = [] 541 members = []
542 followers = []
542 for user in repo.repo_to_perm: 543 for user in repo.repo_to_perm:
543 perm = user.permission.permission_name 544 perm = user.permission.permission_name
544 user = user.user 545 user = user.user
545 user_data = user.get_api_data() 546 user_data = user.get_api_data()
546 user_data['type'] = "user" 547 user_data['type'] = "user"
553 users_group_data = users_group.get_api_data() 554 users_group_data = users_group.get_api_data()
554 users_group_data['type'] = "users_group" 555 users_group_data['type'] = "users_group"
555 users_group_data['permission'] = perm 556 users_group_data['permission'] = perm
556 members.append(users_group_data) 557 members.append(users_group_data)
557 558
559 for user in repo.followers:
560 followers.append(user.user.get_api_data())
561
558 ret['members'] = members 562 ret['members'] = members
563 ret['followers'] = followers
559 564
560 expected = ret 565 expected = ret
561 self._compare_ok(id_, expected, given=response.body) 566 self._compare_ok(id_, expected, given=response.body)
562 destroy_users_group(new_group) 567 destroy_users_group(new_group)
563 568
568 573
569 repo = RepoModel().get_by_repo_name(self.REPO) 574 repo = RepoModel().get_by_repo_name(self.REPO)
570 ret = repo.get_api_data() 575 ret = repo.get_api_data()
571 576
572 members = [] 577 members = []
578 followers = []
573 for user in repo.repo_to_perm: 579 for user in repo.repo_to_perm:
574 perm = user.permission.permission_name 580 perm = user.permission.permission_name
575 user = user.user 581 user = user.user
576 user_data = user.get_api_data() 582 user_data = user.get_api_data()
577 user_data['type'] = "user" 583 user_data['type'] = "user"
583 users_group = users_group.users_group 589 users_group = users_group.users_group
584 users_group_data = users_group.get_api_data() 590 users_group_data = users_group.get_api_data()
585 users_group_data['type'] = "users_group" 591 users_group_data['type'] = "users_group"
586 users_group_data['permission'] = perm 592 users_group_data['permission'] = perm
587 members.append(users_group_data) 593 members.append(users_group_data)
588 594
595 for user in repo.followers:
596 followers.append(user.user.get_api_data())
597
589 ret['members'] = members 598 ret['members'] = members
599 ret['followers'] = followers
590 600
591 expected = ret 601 expected = ret
592 self._compare_ok(id_, expected, given=response.body) 602 self._compare_ok(id_, expected, given=response.body)
593 603
594 def test_api_get_repo_by_non_admin_no_permission_to_repo(self): 604 def test_api_get_repo_by_non_admin_no_permission_to_repo(self):