aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers
diff options
context:
space:
mode:
authorcedricnjanga2017-09-27 16:34:02 +0200
committercedricnjanga2017-09-27 16:34:02 +0200
commit28a352d2c4cba71c796a3504513e0664cec92cb5 (patch)
tree7b37584f2d219df5d580152008f2778d9d9bb0ee /spec/controllers
parent5911206bbadb2c3c9609f8be0ce1affd6584015e (diff)
downloadchouette-core-28a352d2c4cba71c796a3504513e0664cec92cb5.tar.bz2
Refs #4615 Resolve rebase conflict
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/compliance_controls_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/compliance_controls_controller_spec.rb b/spec/controllers/compliance_controls_controller_spec.rb
index 511b61b38..a39408ccb 100644
--- a/spec/controllers/compliance_controls_controller_spec.rb
+++ b/spec/controllers/compliance_controls_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe ComplianceControlsController, type: :controller do
let(:compliance_control) { create(:compliance_control) }
let!(:compliance_control_set) { compliance_control.compliance_control_set }
- let(:compliance_control_params) { compliance_control.as_json.merge(type: 'GenericAttributeMinMax') }
+ let(:compliance_control_params) { compliance_control.as_json.merge(type: 'GenericAttributeControl::MinMax') }
describe "GET show" do
it 'should be successful' do
@@ -47,7 +47,7 @@ RSpec.describe ComplianceControlsController, type: :controller do
it 'should be successful' do
expect {
delete :destroy, compliance_control_set_id: compliance_control_set.id, id: compliance_control.id
- }.to change(GenericAttributeMinMax, :count).by(-1)
+ }.to change(GenericAttributeControl::MinMax, :count).by(-1)
expect(response).to have_http_status(302)
end
end