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

Follow up for sites splits PR #10296 #10310

Merged
merged 1 commit into from
Dec 22, 2017

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Aug 6, 2017

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.

Resolves #10296

Auditors:

Test Plan: covered with automated tests

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

@NejcZdovc NejcZdovc added this to the 0.21.x (Nightly Channel) milestone Aug 6, 2017
@NejcZdovc NejcZdovc self-assigned this Aug 6, 2017
@NejcZdovc NejcZdovc force-pushed the refactor/split-sites-2 branch 3 times, most recently from eda3726 to 4bb21ee Compare August 9, 2017 11:02
@NejcZdovc NejcZdovc force-pushed the refactor/split-sites-2 branch from 4bb21ee to 0cd4d5c Compare August 20, 2017 18:17
NejcZdovc added a commit to NejcZdovc/browser-laptop that referenced this pull request Aug 20, 2017
Resolves brave#10296
Resolves brave#10348
Resolves brave#10310

Auditors:

Test Plan:
@NejcZdovc NejcZdovc force-pushed the refactor/split-sites-2 branch from 0cd4d5c to 8bdd858 Compare August 20, 2017 18:18
@ghost ghost added the sprint/1 label Sep 13, 2017
@bbondy bbondy modified the milestones: 0.21.x (Developer Channel), 0.20.x (Beta Channel) Oct 25, 2017
@cezaraugusto
Copy link
Contributor

@NejcZdovc I'm going to close as stale for now please re-open when you have a window. Thanks!

return Immutable.List()
}

sites = makeImmutable(sites) ? makeImmutable(sites).toList() : Immutable.List()
Copy link
Member

Choose a reason for hiding this comment

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

I know this logic is the same as before, but I think it's wrong. Should it be:
sites = sites ? makeImmutable(sites).toList() : Immutable.List()

Copy link
Member

Choose a reason for hiding this comment

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

(makeImmutable won't return falsey values basically)

Copy link
Member

Choose a reason for hiding this comment

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

Since the above is checking == null (which should also return true for undefined, right?), I think we can simply make it
sites = makeImmutable(sites).toList()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@NejcZdovc NejcZdovc force-pushed the refactor/split-sites-2 branch from 6aa99fb to ae7b30b Compare December 22, 2017 16:47
Resolves brave#10296
Resolves brave#12378

Auditors:

Test Plan:
@NejcZdovc NejcZdovc force-pushed the refactor/split-sites-2 branch from ae7b30b to b112310 Compare December 22, 2017 16:49

sites = makeImmutable(sites)

if (!isList(sites)) {
Copy link
Member

Choose a reason for hiding this comment

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

😄 👌

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++ Looks great!

Copy link
Contributor

@cezaraugusto cezaraugusto left a comment

Choose a reason for hiding this comment

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

++

@cezaraugusto cezaraugusto merged commit ea04284 into brave:master Dec 22, 2017
cezaraugusto added a commit that referenced this pull request Dec 22, 2017
cezaraugusto added a commit that referenced this pull request Dec 22, 2017
@cezaraugusto
Copy link
Contributor

master ea04284
0.21.x 387fe00
0.20.x d8712bc

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

Successfully merging this pull request may close these issues.

5 participants