Skip to content

Commit 6ac046e

Browse files
committed
Fetch members if needed for membership#owner
1 parent e4001af commit 6ac046e

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

features/members_feature.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
r = rhc 'show-domain', domain.name
1818
r.status.should == 0
1919
r.stdout.should_not match "Members:"
20-
r.stdout.should match "owned by #{domain.owner}"
20+
r.stdout.should match "owned by #{domain.owner.name}"
2121
end
2222

2323
it "should prevent leaving the domain for the owner" do

lib/rhc/output_helpers.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module OutputHelpers
33

44
def display_team(team, ids=false)
55
paragraph do
6-
header ["Team #{team.name}", ("(owned by #{team.owner})" if team.owner.present?)] do
6+
header ["Team #{team.name}", ("(owned by #{team.owner.name})" if team.owner.present?)] do
77
section(:bottom => 1) do
88
say format_table \
99
nil,
@@ -21,7 +21,7 @@ def display_team(team, ids=false)
2121

2222
def display_domain(domain, applications=nil, ids=false)
2323
paragraph do
24-
header ["Domain #{domain.name}", ("(owned by #{domain.owner})" if domain.owner.present?)] do
24+
header ["Domain #{domain.name}", ("(owned by #{domain.owner.name})" if domain.owner.present?)] do
2525
section(:bottom => 1) do
2626
say format_table \
2727
nil,

lib/rhc/rest/membership.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,7 @@ def leave(options={})
142142
end
143143

144144
def owner
145-
if o = Array(attributes['members']).find{ |m| m['owner'] == true }
146-
o['name'] || o['login']
147-
end
145+
members.find(&:owner?)
148146
end
149147
end
150148
end

lib/rhc/rest/mock.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,8 @@ def add_domain(id, extra=false)
608608
d = MockRestDomain.new(self, id)
609609
if extra
610610
d.attributes['creation_time'] = '2013-07-21T15:00:44Z'
611-
d.attributes['members'] = [{'owner' => true, 'name' => 'a_user_name'}]
612611
d.attributes['allowed_gear_sizes'] = ['small']
612+
d.add_member(RHC::Rest::Membership::Member.new(:id => '1', :role => 'admin', :explicit_role => 'admin', :owner => true, :login => 'a_user_name', :type => 'user'))
613613
end
614614
@domains << d
615615
d
@@ -723,6 +723,7 @@ def initialize(client, id)
723723
@name = id
724724
@applications = []
725725
self.attributes = {:links => mock_response_links(mock_domain_links(id))}
726+
init_members
726727
end
727728

728729
def rename(id)

0 commit comments

Comments
 (0)