Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Fixes #13485 : Migrate 'components/tutorial/tutorial_tip' module and associated tests to TypeScript #4589

Merged
merged 10 commits into from
Jan 6, 2020
Merged

Fixes #13485 : Migrate 'components/tutorial/tutorial_tip' module and associated tests to TypeScript #4589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3e099f5
migrated tutorial tips to ts
M-ZubairAhmed Dec 25, 2019
38ca438
updated tests
M-ZubairAhmed Dec 25, 2019
0d99021
minor changes
M-ZubairAhmed Dec 25, 2019
593c903
mis removed jsx for one file
M-ZubairAhmed Dec 25, 2019
eeff8ff
removed mistakenly added eslint rule
M-ZubairAhmed Dec 25, 2019
f5916ae
removed lock file from commit
M-ZubairAhmed Dec 26, 2019
efbc1b4
removed spacing
M-ZubairAhmed Dec 26, 2019
22cf83a
removed old snapshot
M-ZubairAhmed Dec 26, 2019
6763a8e
small nit fixed
M-ZubairAhmed Jan 2, 2020
48604c6
Merge branch 'master' into MM-20587
mattermod Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
minor changes
  • Loading branch information
@M-ZubairAhmed
M-ZubairAhmed committed Dec 25, 2019
commit 0d99021700caf68f118cf65a56b997aa1ea25797
2 changes: 1 addition & 1 deletion components/sidebar/sidebar_tutorial_tip.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import React from 'react';
import {shallow} from 'enzyme';

import SidebarTutorialTip from 'components/sidebar/sidebar_tutorial_tip';
import SidebarTutorialTip from 'components/sidebar/sidebar_tutorial_tip.jsx';

describe('component/sidebar/SidebarTutorialTip', () => {
test('should match snapshot, without townSquare and without offTopic', () => {
Expand Down
5 changes: 1 addition & 4 deletions components/tutorial/tutorial_tip/tutorial_tip.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// See LICENSE.txt for license information.

import React from 'react';
import {shallow, ReactWrapper, mount, ShallowWrapper} from 'enzyme';
import {shallow, ShallowWrapper} from 'enzyme';

// import {mountWithIntl} from 'tests/helpers/intl-test-helper';
M-ZubairAhmed marked this conversation as resolved.
Show resolved Hide resolved
import TutorialTip from 'components/tutorial/tutorial_tip/tutorial_tip';
Expand Down Expand Up @@ -33,9 +33,6 @@ describe('components/tutorial/tutorial_tip/tutorial_tip', () => {
const closeRhsMenu = jest.fn();

const props = {...requiredProps, actions: {closeRhsMenu, savePreferences}};

// const wrapper = mountWithIntl(<TutorialTip {...props}/>) as unknown as ReactWrapper<{}, {}, TutorialTip>;
// const wrapper = mount(<TutorialTip {...props}/>) as ReactWrapper<{}, {}, TutorialTip>;
const wrapper: ShallowWrapper<any, any, TutorialTip> = shallow(
<TutorialTip {...props}/>
);
Expand Down