aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorAlban Peignier2017-10-17 11:56:08 +0200
committerAlban Peignier2017-10-17 11:56:08 +0200
commit545671efd71380722dbc3272f5f513ea684891bd (patch)
treee8e1101bf2c8046d61d5185cce8d0b4245ad2183 /spec
parentf480ad0739e5c0ec2c0c8bb890344b9c4777ba35 (diff)
parent58cfec64c621d1c6893280f5ad8793af81573199 (diff)
downloadchouette-core-545671efd71380722dbc3272f5f513ea684891bd.tar.bz2
Merge branch 'master' into staging
Diffstat (limited to 'spec')
-rw-r--r--spec/javascript/spec_helper.js4
-rw-r--r--spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb2
-rw-r--r--spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb2
-rw-r--r--spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb2
4 files changed, 7 insertions, 3 deletions
diff --git a/spec/javascript/spec_helper.js b/spec/javascript/spec_helper.js
new file mode 100644
index 000000000..135995eb2
--- /dev/null
+++ b/spec/javascript/spec_helper.js
@@ -0,0 +1,4 @@
+import $ from 'jquery';
+global.$ = global.jQuery = $;
+
+require('bootstrap') \ No newline at end of file
diff --git a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb
index 61896ef5e..467b4f866 100644
--- a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/maximum_length_cccld_spec.rb
@@ -1,6 +1,6 @@
RSpec.describe RoutingConstraintZoneControl::MaximumLength, type: :model do
- let( :default_code ){ "3-ITL-2" }
+ let( :default_code ){ "3-RoutingConstraint-2" }
let( :factory ){ :routing_constraint_zone_control_maximum_length }
it_behaves_like 'ComplianceControl Class Level Defaults'
diff --git a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb
index e930c2475..b15b69035 100644
--- a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/minimum_length_cccld_spec.rb
@@ -1,6 +1,6 @@
RSpec.describe RoutingConstraintZoneControl::MinimumLength, type: :model do
- let( :default_code ){ "3-ITL-3" }
+ let( :default_code ){ "3-RoutingConstraint-3" }
let( :factory ){ :routing_constraint_zone_control_minimum_length }
it_behaves_like 'ComplianceControl Class Level Defaults'
diff --git a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb
index aba9b7fc1..8d700ebbb 100644
--- a/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/routing_constraint_zone_control/unactivated_stop_point_cccld_spec.rb
@@ -1,6 +1,6 @@
RSpec.describe RoutingConstraintZoneControl::UnactivatedStopPoint, type: :model do
- let( :default_code ){ "3-ITL-1" }
+ let( :default_code ){ "3-RoutingConstraint-1" }
let( :factory ){ :routing_constraint_zone_control_unactivated_stop_point }
it_behaves_like 'ComplianceControl Class Level Defaults'