diff --git a/lib/common/collections/wp_items/detectable.rb b/lib/common/collections/wp_items/detectable.rb index 501454b2..2f4309ea 100755 --- a/lib/common/collections/wp_items/detectable.rb +++ b/lib/common/collections/wp_items/detectable.rb @@ -90,7 +90,7 @@ class WpItems < Array # @return [ Regex ] def passive_detection_pattern(wp_target) type = self.to_s.gsub(/Wp/, '').downcase - regex1 = %r{(?:[^=:]+)\s?(?:=|:)\s?(?:"|')[^"']+\\?/} + regex1 = %r{(?:[^=:\(]+)\s?(?:=|:|\()\s?(?:"|')[^"']+\\?/} regex2 = %r{\\?/} regex3 = %r{\\?/([^/\\"']+)\\?(?:/|"|')} diff --git a/spec/lib/common/collections/wp_items_spec.rb b/spec/lib/common/collections/wp_items_spec.rb index 2a99237e..c548f8e1 100644 --- a/spec/lib/common/collections/wp_items_spec.rb +++ b/spec/lib/common/collections/wp_items_spec.rb @@ -22,7 +22,9 @@ describe WpItems do WpItem.new(uri, name: 'escaped-url') << WpItem.new(uri, name: 'link-tag') << WpItem.new(uri, name: 'script-tag') << - WpItem.new(uri, name: 'style-tag') + WpItem.new(uri, name: 'style-tag'), + + passive_detection2: WpItems.new << WpItem.new(uri, name: 'wp-table-reloaded') } end end diff --git a/spec/lib/common/collections/wp_plugins_spec.rb b/spec/lib/common/collections/wp_plugins_spec.rb index 4c613f7c..e500e4cb 100644 --- a/spec/lib/common/collections/wp_plugins_spec.rb +++ b/spec/lib/common/collections/wp_plugins_spec.rb @@ -23,7 +23,9 @@ describe WpPlugins do WpPlugin.new(uri, name: 'escaped-url') << WpPlugin.new(uri, name: 'link-tag') << WpPlugin.new(uri, name: 'script-tag') << - WpPlugin.new(uri, name: 'style-tag') + WpPlugin.new(uri, name: 'style-tag'), + + passive_detection2: WpItems.new << WpItem.new(uri, name: 'wp-table-reloaded') } end end diff --git a/spec/lib/common/collections/wp_themes_spec.rb b/spec/lib/common/collections/wp_themes_spec.rb index 1e86c3cd..e7cc5172 100644 --- a/spec/lib/common/collections/wp_themes_spec.rb +++ b/spec/lib/common/collections/wp_themes_spec.rb @@ -21,7 +21,9 @@ describe WpThemes do passive_detection: WpThemes.new << WpTheme.new(uri, name: 'theme1') << WpTheme.new(uri, name: 'theme 2') << - WpTheme.new(uri, name: 'theme-3') + WpTheme.new(uri, name: 'theme-3'), + + passive_detection2: WpItems.new << WpItem.new(uri, name: 'wp-table-reloaded') } end end diff --git a/spec/samples/common/collections/wp_items/detectable/passive_detection_2.html b/spec/samples/common/collections/wp_items/detectable/passive_detection_2.html new file mode 100644 index 00000000..0529d0e0 --- /dev/null +++ b/spec/samples/common/collections/wp_items/detectable/passive_detection_2.html @@ -0,0 +1,4 @@ +/* */ diff --git a/spec/samples/common/collections/wp_plugins/detectable/passive_detection_2.html b/spec/samples/common/collections/wp_plugins/detectable/passive_detection_2.html new file mode 100644 index 00000000..24ce6cdb --- /dev/null +++ b/spec/samples/common/collections/wp_plugins/detectable/passive_detection_2.html @@ -0,0 +1,4 @@ +/* */ diff --git a/spec/samples/common/collections/wp_themes/detectable/passive_detection_2.html b/spec/samples/common/collections/wp_themes/detectable/passive_detection_2.html new file mode 100644 index 00000000..ddd26a06 --- /dev/null +++ b/spec/samples/common/collections/wp_themes/detectable/passive_detection_2.html @@ -0,0 +1,4 @@ +/* */ diff --git a/spec/shared_examples/wp_items_detectable.rb b/spec/shared_examples/wp_items_detectable.rb index 979e00f7..f47ea876 100644 --- a/spec/shared_examples/wp_items_detectable.rb +++ b/spec/shared_examples/wp_items_detectable.rb @@ -151,10 +151,15 @@ shared_examples 'WpItems::Detectable' do end context 'when items are present' do - it 'returns the excpected items' do + it 'returns the expected items' do @fixture = fixtures_dir + '/passive_detection.html' @expected = expected[:passive_detection] end + + it 'returns the expected items' do + @fixture = fixtures_dir + '/passive_detection_2.html' + @expected = expected[:passive_detection2] + end end end