Skip to content

Commit

Permalink
Merge pull request woople#7 from kalupa/woople-api-account-index
Browse files Browse the repository at this point in the history
Added Employment index finder on Account
  • Loading branch information
awd committed Mar 27, 2012
2 parents 175cef2 + cc140c0 commit eec5de7
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/woopy/account.rb
Expand Up @@ -12,6 +12,10 @@ def make_owner(user, role = nil)
Ownership.create(account_id: self.id, user_id: user.id, role: role) Ownership.create(account_id: self.id, user_id: user.id, role: role)
end end


def employments
Employment.find(:all, params: {account_id: self.id} )
end

def find_employment(user) def find_employment(user)
employment_json = Account.get("#{self.id}/users/#{user.id}/employment") employment_json = Account.get("#{self.id}/users/#{user.id}/employment")


Expand Down
4 changes: 4 additions & 0 deletions spec/spec_helper.rb
Expand Up @@ -36,6 +36,10 @@ def user_attributes
{ name: "User Name", email: "user@example.com" } { name: "User Name", email: "user@example.com" }
end end


def employment_collection_response
{ employments: [employment_attributes.merge(id: 1)] }.to_json
end

def employment_response def employment_response
{ employment: employment_attributes.merge(id: 1) }.to_json { employment: employment_attributes.merge(id: 1) }.to_json
end end
Expand Down
22 changes: 22 additions & 0 deletions spec/woopy/account_spec.rb
Expand Up @@ -11,6 +11,7 @@
mock.post( '/services/v1/ownerships.json', request_headers(@token), ownership_response ) mock.post( '/services/v1/ownerships.json', request_headers(@token), ownership_response )


mock.get( '/services/v1/accounts/1/users/1/employment.json', accept_request_headers(@token), employment_response ) mock.get( '/services/v1/accounts/1/users/1/employment.json', accept_request_headers(@token), employment_response )
mock.get( '/services/v1/accounts/1/employments.json', accept_request_headers(@token), employment_collection_response )
mock.post( '/services/v1/accounts/1/employments.json', request_headers(@token), employment_response ) mock.post( '/services/v1/accounts/1/employments.json', request_headers(@token), employment_response )
mock.delete( '/services/v1/accounts/1/employments/1.json', accept_request_headers(@token), employment_response ) mock.delete( '/services/v1/accounts/1/employments/1.json', accept_request_headers(@token), employment_response )


Expand Down Expand Up @@ -74,4 +75,25 @@
end end


end end

context "#employments" do
context "users on account" do
before do
@account = Woopy::Account.create(account_attributes)
@employments = add_users_to_account(@account)
end

subject { @account.employments }

it { should == @employments }
end
end

def add_users_to_account(account)
employments = []
user = Woopy::User.create(user_attributes)
employment = account.employ(user)
employments << employment
employments
end
end end

0 comments on commit eec5de7

Please sign in to comment.