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

Make welcome screen show up on first time run #9480

Merged
merged 2 commits into from
Jun 25, 2017
Merged

Make welcome screen show up on first time run #9480

merged 2 commits into from
Jun 25, 2017

Conversation

cezaraugusto
Copy link
Contributor

@cezaraugusto cezaraugusto commented Jun 15, 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.

Auditors: @bsclifton
Close #9423

Test Plan:

npm run test -- --grep="aboutWelcomeReducer"
npm run unittest -- --grep="tabs API unit tests create"
npm run unittest -- --grep="sessionStore unit tests defaultAppState"

Manual test plan:

  1. Have your session as-is
  2. Open Brave with this PR
  3. Open a new tab
  4. About welcome shouldn't show
  5. Clear session
  6. Open Brave
  7. New tab should show, followed by about:welcome as the second tab, active
  8. Open another tab by any means
  9. about:newtab should show alone

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

@cezaraugusto cezaraugusto added this to the 0.17.x (Beta Channel) milestone Jun 15, 2017
@cezaraugusto cezaraugusto self-assigned this Jun 15, 2017
@bsclifton
Copy link
Member

Moving to 0.18.x

@bsclifton bsclifton modified the milestones: 0.18.x (Developer Channel), 0.17.x (Beta Channel) Jun 15, 2017
Copy link
Contributor

@luixxiul luixxiul left a comment

Choose a reason for hiding this comment

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

the manual test plan works.

@bsclifton
Copy link
Member

@cezaraugusto could you rebase please? I'll def review / merge after that 😄 thanks!

@cezaraugusto
Copy link
Contributor Author

ok rebased

@bsclifton
Copy link
Member

I know this is outside the scope of the pull request, but I wanted to show this:

We'll want to update the website (which is shown in about:welcome) to fix the logo being cropped:
screen shot 2017-06-24 at 10 40 49 pm

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.

Changes look great! 😄

I updated the tests- If everything looks good, please go ahead and merge. Thanks! 😄 👍

@@ -673,6 +678,19 @@ const api = {
}
if (!createProperties.url) {
createProperties.url = newFrameUrl()
// don't open welcome screen for general tests
if (process.env.NODE_ENV === 'test') {
shouldShowWelcomeScreen = false
Copy link
Member

Choose a reason for hiding this comment

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

It might be cleaner to set this above, when the value is gotten from appState. Something like:

const shouldShowWelcomeScreen = process.env.NODE_ENV !== 'test' &&
                                appState.getIn(['about', 'welcome', 'showOnLoad'])

Copy link
Member

Choose a reason for hiding this comment

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

actually... nevermind, I have a solution for this 😄

@cezaraugusto
Copy link
Contributor Author

@bsclifton awesome thanks for updating, looks great

@cezaraugusto cezaraugusto merged commit cf6e22f into brave:master Jun 25, 2017
@cezaraugusto cezaraugusto deleted the about/firstrun branch June 25, 2017 18:05
cezaraugusto added a commit that referenced this pull request Jun 25, 2017
Make welcome screen show up on first time run
cezaraugusto added a commit that referenced this pull request Jun 27, 2017
This reverts commit cf6e22f, reversing
changes made to 9c10fa7.
cezaraugusto added a commit that referenced this pull request Jun 28, 2017
This reverts commit cf6e22f, reversing
changes made to 9c10fa7.
bsclifton added a commit that referenced this pull request Jun 28, 2017
bsclifton added a commit that referenced this pull request Jun 28, 2017
bsclifton added a commit that referenced this pull request Jun 28, 2017
bsclifton added a commit that referenced this pull request Jun 28, 2017
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.

3 participants