Merge pull request SeleniumHQ#1 from back-office/fix-adding-extensions

Read Firefox Extension ID from appropriate location in manifest.json
michaelpreston · Jan 15, 2020 · d38a83f · d38a83f
2 parents 2ecb7d9 + c800db7
commit d38a83f
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/rb/lib/selenium/webdriver/firefox/extension.rb b/rb/lib/selenium/webdriver/firefox/extension.rb
@@ -87,6 +87,14 @@ def read_id_from_manifest_json(directory)
           return unless File.exist?(manifest_path)
 
           manifest = JSON.parse(File.read(manifest_path))
+          gecko_id(manifest) || name_and_version(manifest)
+        end
+
+        def gecko_id(manifest)
+          manifest.dig('browser_specific_settings', 'gecko', 'id')&.strip
+        end
+
+        def name_and_version(manifest)
           [manifest['name'].delete(' '), manifest['version']].join('@')
         end
       end # Extension