Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add/feature 2.0.4 #167

Merged
merged 3 commits into from
Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,67 @@ describe('Test SearchItem Component', () => {
});
});

describe('test handleFocusWidget', () => {
it('when props.item.isOpen === true', () => {
const onShowWidget = jest.fn();
const mockEvent = {
preventDefault: jest.fn(),
};
const wrapper = shallow(
<SearchItem
item={{
...mockItem,
isOpen: true,
}}
onShowWidget={onShowWidget}
/>,
);

wrapper.instance().handleFocusWidget(mockEvent);

expect(mockEvent.preventDefault).toHaveBeenCalledTimes(1);
expect(onShowWidget).toHaveBeenCalledTimes(1);
expect(onShowWidget).toHaveBeenCalledWith('mock-id');
});

it('when props.item.isOpen === false', () => {
const onShowWidget = jest.fn();
const mockEvent = {
preventDefault: jest.fn(),
};
const wrapper = shallow(
<SearchItem
item={{
...mockItem,
isOpen: false,
}}
onShowWidget={onShowWidget}
/>,
);

wrapper.instance().handleFocusWidget(mockEvent);
expect(mockEvent.preventDefault).toHaveBeenCalledTimes(0);
expect(onShowWidget).toHaveBeenCalledTimes(0);
});
});

it('should call handleOpenWidget', () => {
const onShowWidget = jest.fn();
const wrapper = shallow(
<SearchItem
item={{
...mockItem,
isOpen: false,
}}
onShowWidget={onShowWidget}
/>,
);

wrapper.instance().handleOpenWidget();

expect(onShowWidget).toHaveBeenCalledTimes(1);
});

it('should call handleToggleFavorites', () => {
const onUpdateInfo = jest.fn();
const wrapper = shallow(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ exports[`Test SearchItem Component should match to snapshot 1`] = `
<button
className="SearchItem__Btn"
onClick={[Function]}
onDoubleClick={[Function]}
type="button"
>
<strong
Expand Down Expand Up @@ -94,6 +95,7 @@ exports[`Test SearchItem Component should match to snapshot when item.searched =
<button
className="SearchItem__Btn"
onClick={[Function]}
onDoubleClick={[Function]}
type="button"
>
<strong
Expand Down
8 changes: 8 additions & 0 deletions app/renderer/pages/search/components/SearchItem/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class SearchItem extends React.Component {
this.handleFocusWidget = this.handleFocusWidget.bind(this);
this.handleToggleWidget = this.handleToggleWidget.bind(this);
this.handleToggleFavorites = this.handleToggleFavorites.bind(this);
this.handleOpenWidget = this.handleOpenWidget.bind(this);
}

handleFocusWidget(e) {
Expand All @@ -55,6 +56,12 @@ class SearchItem extends React.Component {
}
}

handleOpenWidget() {
const { item, onShowWidget } = this.props;

onShowWidget(item.id);
}

handleToggleFavorites() {
const { item, onUpdateInfo } = this.props;

Expand Down Expand Up @@ -83,6 +90,7 @@ class SearchItem extends React.Component {
className="SearchItem__Btn"
type="button"
onClick={this.handleFocusWidget}
onDoubleClick={this.handleOpenWidget}
>
<strong className="SearchItem__title-text">
{(item.searched === 'both' || item.searched === 'name') ? (
Expand Down
18 changes: 16 additions & 2 deletions app/renderer/pages/widget/components/AddressBar/AddressBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,30 @@
padding: 5px;
}

.AddressBar__address-input {
background-color: rgb(240, 240, 240);
.AddressBar__address-value {
display: flex;
width: 80%;
}

.AddressBar__address-input {
background-color: rgb(240, 240, 240);
width: 100%;
height: 100%;
font-size: 13px;
font-weight: 500;
margin-right: 5px;
padding: 0 5px;
}

.AddressBar__cancel-icon {
background-color: #4e5c65;
border-radius: 50%;
width: 15px;
margin: 5px;

align-self: center;
}

.AddressBar__address-button {
width: 20%;
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { shallow } from 'enzyme';
import { shallow, mount } from 'enzyme';
import os from 'os';

import AddressBar from '.';
Expand Down Expand Up @@ -42,6 +42,13 @@ describe('<AddressBar />', () => {
expect(wrapper).toMatchSnapshot();
});

it('should match to snapshot when state.isMouseOverInput true', () => {
const wrapper = shallow(<AddressBar />);
wrapper.setState({ isMouseOverInput: true });

expect(wrapper).toMatchSnapshot();
});

describe('test react lifecycle', () => {
const componentDidMount = jest.spyOn(AddressBar.prototype, 'componentDidMount');
const componentWillUnmount = jest.spyOn(AddressBar.prototype, 'componentWillUnmount');
Expand Down Expand Up @@ -179,6 +186,19 @@ describe('<AddressBar />', () => {
expect(wrapper.instance().state.addressValue).toBe('mock-value');
});

it('should call handleAddressCancel', () => {
const focus = jest.fn();
const wrapper = mount(<AddressBar />);
wrapper.setState({ addressValue: 'mock-value' });
wrapper.instance().addressInputRef.current.focus = focus;

expect(wrapper.instance().state.addressValue).toBe('mock-value');
wrapper.instance().handleAddressCancel();
expect(wrapper.instance().state.addressValue).toBe('');

expect(focus).toHaveBeenCalledTimes(1);
});

describe('test call handleAddressEnter', () => {
const wrapper = shallow(<AddressBar webView={webView} />);

Expand Down Expand Up @@ -323,4 +343,28 @@ describe('<AddressBar />', () => {
expect(webView.stop).toHaveBeenCalledTimes(1);
});
});

it('should handle dobule click on address input tag', () => {
const select = jest.fn();
const wrapper = mount(<AddressBar />);
const input = wrapper.find('.AddressBar__address-input');
const { current: inputRef } = wrapper.instance().addressInputRef;

inputRef.select = select;

expect(select).toHaveBeenCalledTimes(0);
input.simulate('doubleclick');
expect(select).toHaveBeenCalledTimes(1);
});

it('test mouse event on .AddressBar__address-value', () => {
const wrapper = mount(<AddressBar />);
const div = wrapper.find('.AddressBar__address-value');

expect(wrapper.instance().state.isMouseOverInput).toBe(false);
div.simulate('mouseEnter');
expect(wrapper.instance().state.isMouseOverInput).toBe(true);
div.simulate('mouseLeave');
expect(wrapper.instance().state.isMouseOverInput).toBe(false);
});
});
Loading