Skip to content

Commit

Permalink
Work on review feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
coolo committed Dec 4, 2018
1 parent 5b5d746 commit 9db5311
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
7 changes: 2 additions & 5 deletions src/api/app/models/bs_request.rb
Expand Up @@ -706,7 +706,7 @@ def cancelapproval(opts)
end

def calculate_state_from_reviews
return :declined if reviews.any?(&:declined?)
return :declined if reviews.declined.exists?
if reviews.all?(&:accepted?)
:new
else
Expand All @@ -715,10 +715,7 @@ def calculate_state_from_reviews
end

def find_review_for_opts(opts)
reviews.reverse_each do |review|
return review if review.reviewable_by?(opts)
end
nil
reviews.reverse.find { |review| review.reviewable_by?(opts) }
end

def supersede_request(history_arguments, superseded_opt)
Expand Down
2 changes: 2 additions & 0 deletions src/api/app/models/review.rb
Expand Up @@ -45,6 +45,8 @@ class NotFoundError < APIError
scope :bs_request_ids_of_involved_groups, ->(group_ids) { where(group_id: group_ids, state: :new).select(:bs_request_id) }
scope :bs_request_ids_of_involved_users, ->(user_ids) { where(user_id: user_ids).select(:bs_request_id) }

scope :declined, -> { where(state: :declined) }

before_validation(on: :create) do
self.state = :new if self[:state].nil?
end
Expand Down
8 changes: 2 additions & 6 deletions src/api/spec/models/bs_request_spec.rb
Expand Up @@ -152,15 +152,11 @@
end

it 'raises exception on missing by_ paramter' do
expect do
request.change_review_state(:accepted)
end.to raise_error(BsRequest::InvalidReview)
expect { request.change_review_state(:accepted) }.to raise_error(BsRequest::InvalidReview)
end

it 'raises exception on wrong user' do
expect do
request.change_review_state(:accepted, by_user: someone.login)
end.to raise_error(Review::NotFoundError)
expect { request.change_review_state(:accepted, by_user: someone.login) }.to raise_error(Review::NotFoundError)
expect(request.state).to be(:review)
end

Expand Down

0 comments on commit 9db5311

Please sign in to comment.