Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Fix getOrigin to work with muon.url.parse #10407

Merged
merged 1 commit into from
Aug 10, 2017
Merged

Fix getOrigin to work with muon.url.parse #10407

merged 1 commit into from
Aug 10, 2017

Conversation

diracdeltas
Copy link
Member

@diracdeltas diracdeltas commented Aug 10, 2017

Fix #10391
Fix #10408

Test Plan:

  1. go to google.com
  2. click 'remember this decision' and 'deny' when it asks for your location
  3. close tab, open google.com again. it should not ask to see your location.
  4. also try the test plan from Block Scripts from Bravery Icon #10408

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.

Test Plan:

Reviewer Checklist:

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

Fix #10391

Test Plan:
1. go to google.com
2. click 'remember this decision' and 'deny' when it asks for your location
3. close tab, open google.com again. it should not ask to see your location.
@diracdeltas diracdeltas added this to the 0.18.x Hotfix milestone Aug 10, 2017
@bbondy bbondy merged commit 10056bf into master Aug 10, 2017
diracdeltas pushed a commit that referenced this pull request Aug 10, 2017
Fix getOrigin to work with muon.url.parse
diracdeltas pushed a commit that referenced this pull request Aug 10, 2017
Fix getOrigin to work with muon.url.parse
@codecov-io
Copy link

codecov-io commented Aug 10, 2017

Codecov Report

Merging #10407 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master   #10407      +/-   ##
==========================================
+ Coverage    53.8%   53.81%   +<.01%     
==========================================
  Files         238      238              
  Lines       21051    21054       +3     
  Branches     3257     3258       +1     
==========================================
+ Hits        11327    11330       +3     
  Misses       9724     9724
Flag Coverage Δ
#unittest 53.81% <100%> (ø) ⬆️
Impacted Files Coverage Δ
js/lib/urlutil.js 86.34% <100%> (+0.18%) ⬆️

diracdeltas pushed a commit that referenced this pull request Aug 10, 2017
Fix getOrigin to work with muon.url.parse
@@ -429,11 +429,14 @@ const UrlUtil = {
}

let parsed = urlParse(location)
if (parsed.origin) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think at some point in the near future we should convert to chromium urls with a trailing /. Removing them for backwards compat is sure to create problems in the long-term

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Block Scripts from Bravery Icon Remember decision in notification bar doesn't get stored
4 participants