Rebase master and resolve conflicts

10 files changed, 10 insertions, 10 deletions

diff --git a/spec/policies/access_link_policy_spec.rb b/spec/policies/access_link_policy_spec.rb
index 392ad7f92..6194ae55c 100644
--- a/spec/policies/access_link_policy_spec.rb
+++ b/spec/policies/access_link_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::AccessLinkPolicy, type: :policy do
+RSpec.describe AccessLinkPolicy, type: :policy do
 
   let( :record ){ build_stubbed :access_link }
 
diff --git a/spec/policies/access_point_policy_spec.rb b/spec/policies/access_point_policy_spec.rb
index 8154b3d24..b6bc46eb4 100644
--- a/spec/policies/access_point_policy_spec.rb
+++ b/spec/policies/access_point_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::AccessPointPolicy, type: :policy do
+RSpec.describe AccessPointPolicy, type: :policy do
 
   let( :record ){ build_stubbed :access_point }
 
diff --git a/spec/policies/company_policy_spec.rb b/spec/policies/company_policy_spec.rb
index f374e31d2..2d249a2be 100644
--- a/spec/policies/company_policy_spec.rb
+++ b/spec/policies/company_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::CompanyPolicy, type: :policy do
+RSpec.describe CompanyPolicy, type: :policy do
 
   let( :record ){ build_stubbed :company }
   before { stub_policy_scope(record) }
diff --git a/spec/policies/connection_link_policy_spec.rb b/spec/policies/connection_link_policy_spec.rb
index 17cfdeb04..23e40abe3 100644
--- a/spec/policies/connection_link_policy_spec.rb
+++ b/spec/policies/connection_link_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::ConnectionLinkPolicy, type: :policy do
+RSpec.describe ConnectionLinkPolicy, type: :policy do
 
   let( :record ){ build_stubbed :connection_link }
 
diff --git a/spec/policies/group_of_line_policy_spec.rb b/spec/policies/group_of_line_policy_spec.rb
index 7a58a7f0e..29fbb1bfb 100644
--- a/spec/policies/group_of_line_policy_spec.rb
+++ b/spec/policies/group_of_line_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::GroupOfLinePolicy, type: :policy do
+RSpec.describe GroupOfLinePolicy, type: :policy do
 
   let( :record ){ build_stubbed :group_of_line }
   before { stub_policy_scope(record) }
diff --git a/spec/policies/journey_pattern_policy_spec.rb b/spec/policies/journey_pattern_policy_spec.rb
index a7de379a2..39f849277 100644
--- a/spec/policies/journey_pattern_policy_spec.rb
+++ b/spec/policies/journey_pattern_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::JourneyPatternPolicy, type: :policy do
+RSpec.describe JourneyPatternPolicy, type: :policy do
 
   let( :record ){ build_stubbed :journey_pattern }
 
diff --git a/spec/policies/line_policy_spec.rb b/spec/policies/line_policy_spec.rb
index d2248e750..334073506 100644
--- a/spec/policies/line_policy_spec.rb
+++ b/spec/policies/line_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::LinePolicy, type: :policy do
+RSpec.describe LinePolicy, type: :policy do
 
   let( :record ){ build_stubbed :line }
   before { stub_policy_scope(record) }
diff --git a/spec/policies/routing_constraint_zone_policy_spec.rb b/spec/policies/routing_constraint_zone_policy_spec.rb
index 903e3671a..2ef15fa95 100644
--- a/spec/policies/routing_constraint_zone_policy_spec.rb
+++ b/spec/policies/routing_constraint_zone_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::RoutingConstraintZonePolicy, type: :policy do
+RSpec.describe RoutingConstraintZonePolicy, type: :policy do
 
   let( :record ){ build_stubbed :routing_constraint_zone }
 
diff --git a/spec/policies/stop_area_policy_spec.rb b/spec/policies/stop_area_policy_spec.rb
index 1295ecd68..8fe59c8e3 100644
--- a/spec/policies/stop_area_policy_spec.rb
+++ b/spec/policies/stop_area_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::StopAreaPolicy, type: :policy do
+RSpec.describe StopAreaPolicy, type: :policy do
 
   let( :record ){ build_stubbed :stop_area }
   before { stub_policy_scope(record) }
diff --git a/spec/policies/time_table_policy_spec.rb b/spec/policies/time_table_policy_spec.rb
index 6f1e13844..dad3c13bc 100644
--- a/spec/policies/time_table_policy_spec.rb
+++ b/spec/policies/time_table_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::TimeTablePolicy, type: :policy do
+RSpec.describe TimeTablePolicy, type: :policy do
 
   let( :record ){ build_stubbed :time_table }