Skip to content

Commit

Permalink
Merge pull request #3706 from eduardoj/same_shared_example
Browse files Browse the repository at this point in the history
[ci] Shared example was defined twice
  • Loading branch information
bgeuken committed Aug 29, 2017
2 parents 1beec93 + d0c34cb commit 1bdc61b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions src/api/spec/models/bs_request_spec.rb
Expand Up @@ -90,7 +90,7 @@
end

describe '#update_cache' do
RSpec.shared_examples 'after_commit callback' do
RSpec.shared_examples 'bs_request after_commit callback' do
it 'touches the user' do
Timecop.travel(1.minute)
cache_key = user.cache_key
Expand All @@ -105,7 +105,7 @@
let!(:request) { create(:bs_request, creator: user.login) }
let(:user) { create(:admin_user) }

include_examples 'after_commit callback'
include_examples 'bs_request after_commit callback'
end

context 'direct maintainer of a target_project' do
Expand All @@ -123,7 +123,7 @@
let!(:relationship_project_user) { create(:relationship_project_user, project: target_project) }
let(:user) { relationship_project_user.user }

include_examples 'after_commit callback'
include_examples 'bs_request after_commit callback'
end

context 'group maintainer of a target_project' do
Expand All @@ -143,7 +143,7 @@
let!(:groups_user) { create(:groups_user, group: group) }
let(:user) { groups_user.user }

include_examples 'after_commit callback'
include_examples 'bs_request after_commit callback'
end

context 'direct maintainer of a target_package' do
Expand All @@ -163,7 +163,7 @@
let!(:relationship_package_user) { create(:relationship_package_user, package: target_package) }
let(:user) { relationship_package_user.user }

include_examples 'after_commit callback'
include_examples 'bs_request after_commit callback'
end

context 'group maintainer of a target_package' do
Expand All @@ -185,7 +185,7 @@
let!(:groups_user) { create(:groups_user, group: group) }
let(:user) { groups_user.user }

include_examples 'after_commit callback'
include_examples 'bs_request after_commit callback'
end
end

Expand Down
14 changes: 7 additions & 7 deletions src/api/spec/models/review_spec.rb
Expand Up @@ -318,7 +318,7 @@
end

describe '#update_caches' do
RSpec.shared_examples 'after_commit callback' do
RSpec.shared_examples 'review after_commit callback' do
it 'touches the user' do
Timecop.travel(1.minute)
cache_key = user.cache_key
Expand All @@ -333,7 +333,7 @@
let!(:review) { create(:user_review) }
let(:user) { review.user }

include_examples 'after_commit callback'
include_examples 'review after_commit callback'
end

context 'by_group' do
Expand All @@ -342,7 +342,7 @@
let(:user) { groups_user.user }
let!(:review) { create(:review, by_group: group) }

include_examples 'after_commit callback'
include_examples 'review after_commit callback'
end

context 'by_package with a direct relationship' do
Expand All @@ -351,7 +351,7 @@
let(:user) { relationship_package_user.user }
let!(:review) { create(:review, by_package: package, by_project: package.project) }

include_examples 'after_commit callback'
include_examples 'review after_commit callback'
end

context 'by_package with a group relationship' do
Expand All @@ -362,7 +362,7 @@
let!(:user) { groups_user.user }
let!(:review) { create(:review, by_package: package, by_project: package.project) }

include_examples 'after_commit callback'
include_examples 'review after_commit callback'
end

context 'by_project with a direct relationship' do
Expand All @@ -371,7 +371,7 @@
let(:user) { relationship_project_user.user }
let!(:review) { create(:review, by_project: project) }

include_examples 'after_commit callback'
include_examples 'review after_commit callback'
end

context 'by_project with a group relationship' do
Expand All @@ -382,7 +382,7 @@
let!(:user) { groups_user.user }
let!(:review) { create(:review, by_project: project) }

include_examples 'after_commit callback'
include_examples 'review after_commit callback'
end
end
end

0 comments on commit 1bdc61b

Please sign in to comment.