Skip to content

Commit 74df033

Browse files
moleskemoleske
committed
add rspec/includeexamples
1 parent d752b88 commit 74df033

35 files changed

Lines changed: 431 additions & 429 deletions

‎.rubocop_cc.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,8 @@ RSpec/ExcessiveDocstringSpacing:
560560
Enabled: true
561561
RSpec/IdenticalEqualityAssertion:
562562
Enabled: true
563+
RSpec/IncludeExamples:
564+
Enabled: true
563565
RSpec/IndexedLet:
564566
Enabled: true
565567
RSpec/MatchArray:

‎spec/acceptance/broker_api_compatibility/broker_api_v2.0_spec.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def request_has_version_header(method, url)
105105

106106
it_behaves_like 'a catalog fetch request'
107107

108-
include_examples 'broker errors'
108+
it_behaves_like 'broker errors'
109109

110110
it 'handles the broker response' do
111111
expect(last_response).to have_status_code(201)
@@ -126,7 +126,7 @@ def request_has_version_header(method, url)
126126

127127
it_behaves_like 'a catalog fetch request'
128128

129-
include_examples 'broker errors'
129+
it_behaves_like 'broker errors'
130130

131131
it 'handles the broker response' do
132132
expect(last_response).to have_status_code(200)
@@ -169,7 +169,7 @@ def request_has_version_header(method, url)
169169
admin_headers)
170170
end
171171

172-
include_examples 'broker errors'
172+
it_behaves_like 'broker errors'
173173

174174
it 'sends all required fields' do
175175
expect(a_request(:put, %r{broker-url/v2/service_instances/#{guid_pattern}}).
@@ -258,7 +258,7 @@ def request_has_version_header(method, url)
258258
admin_headers)
259259
end
260260

261-
include_examples 'broker errors'
261+
it_behaves_like 'broker errors'
262262

263263
it 'uses the correct version header' do
264264
request_has_version_header(:put, %r{/v2/service_instances/#{service_instance_guid}/service_bindings/#{guid_pattern}$})
@@ -340,7 +340,7 @@ def request_has_version_header(method, url)
340340
admin_headers)
341341
end
342342

343-
include_examples 'broker errors'
343+
it_behaves_like 'broker errors'
344344

345345
it 'sends all required fields' do
346346
expected_url = %r{broker-url/v2/service_instances/#{service_instance_guid}/service_bindings/#{guid_pattern}\?plan_id=plan1-guid-here&service_id=service-guid-here}
@@ -397,7 +397,7 @@ def request_has_version_header(method, url)
397397
admin_headers)
398398
end
399399

400-
include_examples 'broker errors'
400+
it_behaves_like 'broker errors'
401401

402402
it 'sends all required fields' do
403403
expect(a_request(:delete, %r{broker-url/v2/service_instances/#{service_instance_guid}\?plan_id=plan1-guid-here&service_id=service-guid-here})).

‎spec/migrations/20250318112800_add_user_id_index_to_roles_tables_spec.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565
let(:migration_filename) { '20250318112800_add_user_id_index_to_roles_tables.rb' }
6666
end
6767

68-
include_examples 'adding an index for table', 'organizations_auditors'
69-
include_examples 'adding an index for table', 'organizations_billing_managers'
70-
include_examples 'adding an index for table', 'organizations_managers'
71-
include_examples 'adding an index for table', 'organizations_users'
72-
include_examples 'adding an index for table', 'spaces_auditors'
73-
include_examples 'adding an index for table', 'spaces_developers'
74-
include_examples 'adding an index for table', 'spaces_managers'
75-
include_examples 'adding an index for table', 'spaces_supporters'
68+
it_behaves_like 'adding an index for table', 'organizations_auditors'
69+
it_behaves_like 'adding an index for table', 'organizations_billing_managers'
70+
it_behaves_like 'adding an index for table', 'organizations_managers'
71+
it_behaves_like 'adding an index for table', 'organizations_users'
72+
it_behaves_like 'adding an index for table', 'spaces_auditors'
73+
it_behaves_like 'adding an index for table', 'spaces_developers'
74+
it_behaves_like 'adding an index for table', 'spaces_managers'
75+
it_behaves_like 'adding an index for table', 'spaces_supporters'
7676
end

‎spec/request/packages_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@
913913
}
914914
end
915915

916-
include_examples 'upload bits successfully'
916+
it_behaves_like 'upload bits successfully'
917917
end
918918

919919
context 'with v3 resources' do
@@ -927,7 +927,7 @@
927927
}
928928
end
929929

930-
include_examples 'upload bits successfully'
930+
it_behaves_like 'upload bits successfully'
931931
end
932932

933933
context 'telemetry' do

‎spec/unit/controllers/base/model_controller_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ def run_delayed_job
372372
expect(last_response.body).to eq('')
373373
end
374374

375-
include_examples 'tests with associations'
375+
it_behaves_like 'tests with associations'
376376
end
377377

378378
context 'when async=true' do
@@ -392,7 +392,7 @@ def run_delayed_job
392392
end
393393
end
394394

395-
include_examples 'tests with associations'
395+
it_behaves_like 'tests with associations'
396396
end
397397
end
398398

‎spec/unit/controllers/runtime/apps_controller_spec.rb‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,40 +2036,40 @@ def delete_app
20362036
let(:member_a) { @org_a_manager }
20372037
let(:member_b) { @org_b_manager }
20382038

2039-
include_examples 'permission enumeration', 'OrgManager',
2040-
name: 'app',
2041-
path: '/v2/apps',
2042-
enumerate: 1
2039+
it_behaves_like 'permission enumeration', 'OrgManager',
2040+
name: 'app',
2041+
path: '/v2/apps',
2042+
enumerate: 1
20432043
end
20442044

20452045
describe 'OrgUser' do
20462046
let(:member_a) { @org_a_member }
20472047
let(:member_b) { @org_b_member }
20482048

2049-
include_examples 'permission enumeration', 'OrgUser',
2050-
name: 'app',
2051-
path: '/v2/apps',
2052-
enumerate: 0
2049+
it_behaves_like 'permission enumeration', 'OrgUser',
2050+
name: 'app',
2051+
path: '/v2/apps',
2052+
enumerate: 0
20532053
end
20542054

20552055
describe 'BillingManager' do
20562056
let(:member_a) { @org_a_billing_manager }
20572057
let(:member_b) { @org_b_billing_manager }
20582058

2059-
include_examples 'permission enumeration', 'BillingManager',
2060-
name: 'app',
2061-
path: '/v2/apps',
2062-
enumerate: 0
2059+
it_behaves_like 'permission enumeration', 'BillingManager',
2060+
name: 'app',
2061+
path: '/v2/apps',
2062+
enumerate: 0
20632063
end
20642064

20652065
describe 'Auditor' do
20662066
let(:member_a) { @org_a_auditor }
20672067
let(:member_b) { @org_b_auditor }
20682068

2069-
include_examples 'permission enumeration', 'Auditor',
2070-
name: 'app',
2071-
path: '/v2/apps',
2072-
enumerate: 0
2069+
it_behaves_like 'permission enumeration', 'Auditor',
2070+
name: 'app',
2071+
path: '/v2/apps',
2072+
enumerate: 0
20732073
end
20742074
end
20752075

@@ -2078,30 +2078,30 @@ def delete_app
20782078
let(:member_a) { @space_a_manager }
20792079
let(:member_b) { @space_b_manager }
20802080

2081-
include_examples 'permission enumeration', 'SpaceManager',
2082-
name: 'app',
2083-
path: '/v2/apps',
2084-
enumerate: 1
2081+
it_behaves_like 'permission enumeration', 'SpaceManager',
2082+
name: 'app',
2083+
path: '/v2/apps',
2084+
enumerate: 1
20852085
end
20862086

20872087
describe 'Developer' do
20882088
let(:member_a) { @space_a_developer }
20892089
let(:member_b) { @space_b_developer }
20902090

2091-
include_examples 'permission enumeration', 'Developer',
2092-
name: 'app',
2093-
path: '/v2/apps',
2094-
enumerate: 1
2091+
it_behaves_like 'permission enumeration', 'Developer',
2092+
name: 'app',
2093+
path: '/v2/apps',
2094+
enumerate: 1
20952095
end
20962096

20972097
describe 'SpaceAuditor' do
20982098
let(:member_a) { @space_a_auditor }
20992099
let(:member_b) { @space_b_auditor }
21002100

2101-
include_examples 'permission enumeration', 'SpaceAuditor',
2102-
name: 'app',
2103-
path: '/v2/apps',
2104-
enumerate: 1
2101+
it_behaves_like 'permission enumeration', 'SpaceAuditor',
2102+
name: 'app',
2103+
path: '/v2/apps',
2104+
enumerate: 1
21052105
end
21062106
end
21072107
end

‎spec/unit/controllers/runtime/domains_controller_spec.rb‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -60,43 +60,43 @@ module VCAP::CloudController
6060
let(:member_b) { @org_b_manager }
6161
let(:enumeration_expectation_a) { [@obj_a, @shared_domain] }
6262

63-
include_examples 'permission enumeration', 'OrgManager',
64-
name: 'domain',
65-
path: '/v2/domains',
66-
enumerate: 2
63+
it_behaves_like 'permission enumeration', 'OrgManager',
64+
name: 'domain',
65+
path: '/v2/domains',
66+
enumerate: 2
6767
end
6868

6969
describe 'OrgUser' do
7070
let(:member_a) { @org_a_member }
7171
let(:member_b) { @org_b_member }
7272
let(:enumeration_expectation_a) { [@shared_domain] }
7373

74-
include_examples 'permission enumeration', 'OrgUser',
75-
name: 'domain',
76-
path: '/v2/domains',
77-
enumerate: 1
74+
it_behaves_like 'permission enumeration', 'OrgUser',
75+
name: 'domain',
76+
path: '/v2/domains',
77+
enumerate: 1
7878
end
7979

8080
describe 'BillingManager' do
8181
let(:member_a) { @org_a_billing_manager }
8282
let(:member_b) { @org_b_billing_manager }
8383
let(:enumeration_expectation_a) { [@shared_domain] }
8484

85-
include_examples 'permission enumeration', 'BillingManager',
86-
name: 'domain',
87-
path: '/v2/domains',
88-
enumerate: 1
85+
it_behaves_like 'permission enumeration', 'BillingManager',
86+
name: 'domain',
87+
path: '/v2/domains',
88+
enumerate: 1
8989
end
9090

9191
describe 'Auditor' do
9292
let(:member_a) { @org_a_auditor }
9393
let(:member_b) { @org_b_auditor }
9494
let(:enumeration_expectation_a) { [@obj_a, @shared_domain] }
9595

96-
include_examples 'permission enumeration', 'Auditor',
97-
name: 'domain',
98-
path: '/v2/domains',
99-
enumerate: 2
96+
it_behaves_like 'permission enumeration', 'Auditor',
97+
name: 'domain',
98+
path: '/v2/domains',
99+
enumerate: 2
100100
end
101101

102102
context 'with a shared private domain' do
@@ -108,22 +108,22 @@ module VCAP::CloudController
108108
let(:member_a) { @org_b_manager }
109109
let(:enumeration_expectation_a) { [@obj_a, @obj_b, @shared_domain] }
110110

111-
include_examples 'permission enumeration', 'OrgManager',
112-
permissions_overlap: true,
113-
name: 'domain',
114-
path: '/v2/domains',
115-
enumerate: 3
111+
it_behaves_like 'permission enumeration', 'OrgManager',
112+
permissions_overlap: true,
113+
name: 'domain',
114+
path: '/v2/domains',
115+
enumerate: 3
116116
end
117117

118118
describe 'SpaceDeveloper' do
119119
let(:member_a) { @space_b_developer }
120120
let(:enumeration_expectation_a) { [@obj_a, @obj_b, @shared_domain] }
121121

122-
include_examples 'permission enumeration', 'SpaceDeveloper',
123-
permissions_overlap: true,
124-
name: 'domain',
125-
path: '/v2/domains',
126-
enumerate: 3
122+
it_behaves_like 'permission enumeration', 'SpaceDeveloper',
123+
permissions_overlap: true,
124+
name: 'domain',
125+
path: '/v2/domains',
126+
enumerate: 3
127127
end
128128
end
129129
end

‎spec/unit/controllers/runtime/organizations_controller_spec.rb‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ module VCAP::CloudController
8080
let(:member_a) { @org_a_manager }
8181
let(:member_b) { @org_b_manager }
8282

83-
include_examples 'permission enumeration', 'OrgManager',
84-
name: 'organization',
85-
path: '/v2/organizations',
86-
enumerate: 1
83+
it_behaves_like 'permission enumeration', 'OrgManager',
84+
name: 'organization',
85+
path: '/v2/organizations',
86+
enumerate: 1
8787

8888
it 'cannot update quota definition' do
8989
quota = QuotaDefinition.make
@@ -111,30 +111,30 @@ module VCAP::CloudController
111111
let(:member_a) { @org_a_member }
112112
let(:member_b) { @org_b_member }
113113

114-
include_examples 'permission enumeration', 'OrgUser',
115-
name: 'organization',
116-
path: '/v2/organizations',
117-
enumerate: 1
114+
it_behaves_like 'permission enumeration', 'OrgUser',
115+
name: 'organization',
116+
path: '/v2/organizations',
117+
enumerate: 1
118118
end
119119

120120
describe 'BillingManager' do
121121
let(:member_a) { @org_a_billing_manager }
122122
let(:member_b) { @org_b_billing_manager }
123123

124-
include_examples 'permission enumeration', 'BillingManager',
125-
name: 'organization',
126-
path: '/v2/organizations',
127-
enumerate: 1
124+
it_behaves_like 'permission enumeration', 'BillingManager',
125+
name: 'organization',
126+
path: '/v2/organizations',
127+
enumerate: 1
128128
end
129129

130130
describe 'Auditor' do
131131
let(:member_a) { @org_a_auditor }
132132
let(:member_b) { @org_b_auditor }
133133

134-
include_examples 'permission enumeration', 'Auditor',
135-
name: 'organization',
136-
path: '/v2/organizations',
137-
enumerate: 1
134+
it_behaves_like 'permission enumeration', 'Auditor',
135+
name: 'organization',
136+
path: '/v2/organizations',
137+
enumerate: 1
138138
end
139139
end
140140
end

0 commit comments

Comments
 (0)