(CONT-802) - Style/RedundantRegexpEscape

Author: jordanbreen28

.rubocop_todo.yml

@@ -22,19 +22,6 @@ RSpec/RepeatedExampleGroupBody:
   Exclude:
     - 'spec/defines/config/server/realm_spec.rb'
 
-# # Offense count: 1
-# Style/MixinUsage:
-#   Exclude:
-#     - 'spec/spec_helper.rb'
-
-# Offense count: 22
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpEscape:
-  Exclude:
-    - 'spec/acceptance/acceptance_3b_spec.rb'
-    - 'spec/acceptance/acceptance_4b_spec.rb'
-    - 'spec/defines/setenv/entry_spec.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.

spec/acceptance/acceptance_3b_spec.rb

@@ -169,7 +169,7 @@ class { 'tomcat':
 
     it 'shoud have a service named FooBar and a class names FooBar' do
       run_shell('cat /opt/apache-tomcat8/tomcat8/conf/server.xml') do |r|
-        expect(r.stdout).to match(%r{<Service name="org.apache.catalina.core.StandardService" className="org.apache.catalina.core.StandardService"><\/Service>})
+        expect(r.stdout).to match(%r{<Service name="org.apache.catalina.core.StandardService" className="org.apache.catalina.core.StandardService"></Service>})
       end
     end
   end
@@ -187,7 +187,7 @@ class { 'tomcat':
 
     it 'has changed the conf.xml file' do
       run_shell('cat /opt/apache-tomcat8/tomcat8/conf/server.xml') do |r|
-        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve"><\/Valve>})
+        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve"></Valve>})
       end
     end
   end
@@ -206,7 +206,7 @@ class { 'tomcat':
 
     it 'has changed the conf.xml file' do
       run_shell('cat /opt/apache-tomcat8/tomcat8/conf/server.xml') do |r|
-        expect(r.stdout).not_to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve"><\/Valve>})
+        expect(r.stdout).not_to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve"></Valve>})
       end
     end
   end
@@ -321,7 +321,7 @@ class { 'tomcat':
 
     it 'has changed the context.xml file' do
       run_shell('cat /opt/apache-tomcat8/tomcat8/conf/context.xml') do |r|
-        expect(r.stdout).to match(%r{<Environment name="testEnvVar" type="java.lang.String" value="a value with a space"><\/Environment>})
+        expect(r.stdout).to match(%r{<Environment name="testEnvVar" type="java.lang.String" value="a value with a space"></Environment>})
       end
     end
   end
@@ -344,7 +344,7 @@ class { 'tomcat':
 
     it 'has changed the context.xml file' do
       run_shell('cat /opt/apache-tomcat8/tomcat8/conf/context.xml') do |r|
-        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*><\/Valve>})
+        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*></Valve>})
       end
     end
   end
@@ -384,8 +384,8 @@ class { 'tomcat':
 
     it 'has changed the context.xml file' do
       run_shell('cat /opt/apache-tomcat8/tomcat8/conf/context.xml') do |r|
-        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*prefix="localhost_access_log".*><\/Valve>})
-        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*prefix="localhost_access_log_rare".*><\/Valve>})
+        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*prefix="localhost_access_log".*></Valve>})
+        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*prefix="localhost_access_log_rare".*></Valve>})
       end
     end
   end
@@ -408,7 +408,7 @@ class { 'tomcat':
 
     it 'has changed the context.xml file' do
       run_shell('cat /opt/apache-tomcat8/tomcat8/conf/context.xml') do |r|
-        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*name="testValve".*><\/Valve>})
+        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*name="testValve".*></Valve>})
       end
     end
   end
@@ -440,8 +440,8 @@ class { 'tomcat':
 
     it 'has changed the context.xml file' do
       run_shell('cat /opt/apache-tomcat8/tomcat8/conf/context.xml') do |r|
-        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*name="testValve".*><\/Valve>})
-        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*name="testValve2".*><\/Valve>})
+        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*name="testValve".*></Valve>})
+        expect(r.stdout).to match(%r{<Valve className="org.apache.catalina.valves.AccessLogValve".*name="testValve2".*></Valve>})
       end
     end
   end

spec/acceptance/acceptance_4b_spec.rb

@@ -83,10 +83,10 @@ class { 'tomcat': catalina_home => '/opt/apache-tomcat40', }
     it 'contains two realms in config file', retry: 5, retry_wait: 10 do
       run_shell('cat /opt/apache-tomcat40/conf/server.xml') do |r|
         expect(r.stdout).to match(
-          %r{<Realm puppetName="org.apache.catalina.realm.MyRealm1" className="org.apache.catalina.realm.MyRealm" resourceName="MyRealm1" otherAttribute="more stuff"><\/Realm>},
+          %r{<Realm puppetName="org.apache.catalina.realm.MyRealm1" className="org.apache.catalina.realm.MyRealm" resourceName="MyRealm1" otherAttribute="more stuff"></Realm>},
         )
         expect(r.stdout).to match(
-          %r{<Realm puppetName="org.apache.catalina.realm.MyRealm2" className="org.apache.catalina.realm.MyRealm" resourceName="MyRealm2" otherAttribute="more stuff"><\/Realm>},
+          %r{<Realm puppetName="org.apache.catalina.realm.MyRealm2" className="org.apache.catalina.realm.MyRealm" resourceName="MyRealm2" otherAttribute="more stuff"></Realm>},
         )
       end
     end

spec/defines/setenv/entry_spec.rb

@@ -28,7 +28,7 @@
     it { is_expected.to contain_concat('/opt/apache-tomcat/bin/setenv.sh') }
 
     it {
-      expect(subject).to contain_concat__fragment('setenv-FOO').with_content(%r{export FOO=\/bin\/true}).with('target' => '/opt/apache-tomcat/bin/setenv.sh')
+      expect(subject).to contain_concat__fragment('setenv-FOO').with_content(%r{export FOO=/bin/true}).with('target' => '/opt/apache-tomcat/bin/setenv.sh')
     }
   end
 
@@ -45,7 +45,7 @@
     it { is_expected.to contain_concat('/opt/apache-tomcat/foo/bin/setenv.sh') }
 
     it {
-      expect(subject).to contain_concat__fragment('setenv-FOO').with_content(%r{export BAR="\/bin\/true"}).with('target' => '/opt/apache-tomcat/foo/bin/setenv.sh')
+      expect(subject).to contain_concat__fragment('setenv-FOO').with_content(%r{export BAR="/bin/true"}).with('target' => '/opt/apache-tomcat/foo/bin/setenv.sh')
     }
   end
 
@@ -91,7 +91,7 @@
     it { is_expected.to contain_concat('/opt/apache-tomcat/foo/bin/setenv.sh') }
 
     it {
-      expect(subject).to contain_concat__fragment('setenv-FOO').with_content(%r{export BAR="\/bin\/true \/bin\/false"}).with('target' => '/opt/apache-tomcat/foo/bin/setenv.sh')
+      expect(subject).to contain_concat__fragment('setenv-FOO').with_content(%r{export BAR="/bin/true /bin/false"}).with('target' => '/opt/apache-tomcat/foo/bin/setenv.sh')
     }
   end
 
@@ -107,7 +107,7 @@
     it { is_expected.to contain_concat('/opt/apache-tomcat/bin/setenv.sh') }
 
     it {
-      expect(subject).to contain_concat__fragment('setenv-FOO').with_content(%r{export BAR=\/bin\/true}).with('target' => '/opt/apache-tomcat/bin/setenv.sh', 'order' => '10')
+      expect(subject).to contain_concat__fragment('setenv-FOO').with_content(%r{export BAR=/bin/true}).with('target' => '/opt/apache-tomcat/bin/setenv.sh', 'order' => '10')
     }
   end
 end