Skip to content
This repository has been archived by the owner on Nov 19, 2018. It is now read-only.

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
biow0lf committed Oct 18, 2016
1 parent 5906de1 commit 2d6cc04
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions app/queries/all_bugs_for_maintainer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ def decorate
private

def components
branch.srpms.joins(:packages).where(name: maintainer_packages_name).pluck('packages.name').sort.uniq
branch.srpms.joins(:packages).where(name: maintainer_packages_names).pluck('packages.name').sort.uniq
end

def maintainer_packages_name
def maintainer_packages_names
Redis.current.smembers("#{ branch.name }:maintainers:#{ maintainer.login }")
end
end
12 changes: 6 additions & 6 deletions spec/queries/all_bugs_for_maintainer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@
# private methods

describe '#components' do
let(:maintainer_packages_name) { double }
let(:maintainer_packages_names) { double }

before { expect(subject).to receive(:maintainer_packages_name).and_return(maintainer_packages_name) }
before { expect(subject).to receive(:maintainer_packages_names).and_return(maintainer_packages_names) }

before do
#
# branch.srpms.joins(:packages).where(name: maintainer_packages_name).pluck('packages.name').sort.uniq
# branch.srpms.joins(:packages).where(name: maintainer_packages_names).pluck('packages.name').sort.uniq
#
expect(branch).to receive(:srpms) do
double.tap do |a|
expect(a).to receive(:joins).with(:packages) do
double.tap do |b|
expect(b).to receive(:where).with(name: maintainer_packages_name) do
expect(b).to receive(:where).with(name: maintainer_packages_names) do
double.tap do |c|
expect(c).to receive(:pluck).with('packages.name') do
double.tap do |d|
Expand All @@ -88,7 +88,7 @@
specify { expect { subject.send(:components) }.not_to raise_error }
end

describe '#maintainer_packages_name' do
describe '#maintainer_packages_names' do
before { expect(branch).to receive(:name).and_return('Sisyphus') }

before { expect(maintainer).to receive(:login).and_return('icesik') }
Expand All @@ -104,6 +104,6 @@
end
end

specify { expect { subject.send(:maintainer_packages_name) }.not_to raise_error }
specify { expect { subject.send(:maintainer_packages_names) }.not_to raise_error }
end
end

0 comments on commit 2d6cc04

Please sign in to comment.