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.

Sign up for GitHub

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

Fixed broken tabs on docs site #1916

Merged
merged 3 commits into from
Oct 19, 2015
Merged

Fixed broken tabs on docs site #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13f1b31
Fixed broken tabs on docs site
shaurya947 Oct 19, 2015
0d7edb3
Updated unit tests for React 0.14
shaurya947 Oct 19, 2015
a08aa3c
Fix route for home buttons
shaurya947 Oct 19, 2015
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
18 changes: 9 additions & 9 deletions docs/src/app/components/master.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ const Master = React.createClass({
render() {
let styles = this.getStyles();
let title =
this.props.history.isActive('get-started') ? 'Get Started' :
this.props.history.isActive('customization') ? 'Customization' :
this.props.history.isActive('components') ? 'Components' : '';
this.props.history.isActive('/get-started') ? 'Get Started' :
this.props.history.isActive('/customization') ? 'Customization' :
this.props.history.isActive('/components') ? 'Components' : '';

let githubButton = (
<IconButton
Expand Down Expand Up @@ -223,9 +223,9 @@ const Master = React.createClass({
},

_getSelectedIndex() {
return this.props.history.isActive('get-started') ? '1' :
this.props.history.isActive('customization') ? '2' :
this.props.history.isActive('components') ? '3' : '0';
return this.props.history.isActive('/get-started') ? '1' :
this.props.history.isActive('/customization') ? '2' :
this.props.history.isActive('/components') ? '3' : '0';
},

_handleTabChange(value, e, tab) {
Expand All @@ -235,9 +235,9 @@ const Master = React.createClass({

_getAppBar() {
let title =
this.props.history.isActive('get-started') ? 'Get Started' :
this.props.history.isActive('customization') ? 'Customization' :
this.props.history.isActive('components') ? 'Components' : '';
this.props.history.isActive('/get-started') ? 'Get Started' :
this.props.history.isActive('/customization') ? 'Customization' :
this.props.history.isActive('/components') ? 'Components' : '';

let githubButton = (
<IconButton
Expand Down
2 changes: 1 addition & 1 deletion docs/src/app/components/mobile-tear-sheet.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const MobileTearSheet = React.createClass({
mixins: [StylePropable],

contextTypes : {
muiTheme: React.PropTypes.func
muiTheme: React.PropTypes.object
},

propTypes: {
Expand Down
6 changes: 3 additions & 3 deletions docs/src/app/components/pages/home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,16 +158,16 @@ const HomePage = React.createClass({
<FullWidthSection useContent={true} contentStyle={styles}>
<HomeFeature
heading="Get Started"
route="get-started"
route="/get-started"
img="images/get-started.svg"
firstChild={true}/>
<HomeFeature
heading="Customization"
route="customization"
route="/customization"
img="images/css-framework.svg" />
<HomeFeature
heading="Components"
route="components"
route="/components"
img="images/components.svg"
lastChild={true}/>
</FullWidthSection>
Expand Down
16 changes: 8 additions & 8 deletions test/checkbox-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ describe('Checkbox', () => {
let render = TestUtils.renderIntoDocument(<ThemedCheckbox defaultChecked={true} />);
let input = TestUtils.findRenderedDOMComponentWithTag(render, 'input');
let svgs = TestUtils.scryRenderedDOMComponentsWithTag(render, 'svg');
let checkMarkNode = svgs[1].getDOMNode();
let checkMarkNode = svgs[1];

expect(input.getDOMNode().hasAttribute('checked')).to.be.true;
expect(input.hasAttribute('checked')).to.be.true;
expect(checkMarkNode.style.opacity).to.equal('1');
expect(checkMarkNode.firstChild.getAttribute('d')).to.equal(CHECKMARK_PATH);
});
Expand All @@ -31,9 +31,9 @@ describe('Checkbox', () => {
let render = TestUtils.renderIntoDocument(<ThemedCheckbox defaultChecked={false} />);
let input = TestUtils.findRenderedDOMComponentWithTag(render, 'input');
let svgs = TestUtils.scryRenderedDOMComponentsWithTag(render, 'svg');
let checkMarkNode = svgs[1].getDOMNode();
let checkMarkNode = svgs[1];

expect(input.getDOMNode().hasAttribute('checked')).to.be.false;
expect(input.hasAttribute('checked')).to.be.false;
expect(checkMarkNode.style.opacity).to.equal('0');
expect(checkMarkNode.firstChild.getAttribute('d')).to.equal(CHECKMARK_PATH);
});
Expand All @@ -50,28 +50,28 @@ describe('Checkbox', () => {

it('should display checkmark when clicked once', () => {
let input = TestUtils.findRenderedDOMComponentWithTag(renderedCheckbox, 'input');
let inputNode = input.getDOMNode();
let inputNode = input;
inputNode.checked = !inputNode.checked;
TestUtils.Simulate.change(input);

let svgs = TestUtils.scryRenderedDOMComponentsWithTag(renderedCheckbox, 'svg');
let checkMarkNode = svgs[1].getDOMNode();
let checkMarkNode = svgs[1];
expect(checkMarkNode.style.opacity).to.equal('1');
expect(checkMarkNode.firstChild.getAttribute('d')).to.equal(CHECKMARK_PATH);
});


it('should NOT display checkmark when clicked twice', () => {
let input = TestUtils.findRenderedDOMComponentWithTag(renderedCheckbox, 'input');
let inputNode = input.getDOMNode();
let inputNode = input;
// Simulate events
inputNode.checked = !inputNode.checked;
TestUtils.Simulate.change(input);
inputNode.checked = !inputNode.checked;
TestUtils.Simulate.change(input);

let svgs = TestUtils.scryRenderedDOMComponentsWithTag(renderedCheckbox, 'svg');
let checkMarkNode = svgs[1].getDOMNode();
let checkMarkNode = svgs[1];
expect(checkMarkNode.style.opacity).to.equal('0');
expect(checkMarkNode.firstChild.getAttribute('d')).to.equal(CHECKMARK_PATH);
});
Expand Down
2 changes: 1 addition & 1 deletion test/drop-down-menu-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('DropDownMenu', () => {
value={value}/>
);
let divWithSelectedText =
TestUtils.scryRenderedDOMComponentsWithTag(render, 'div')[1].getDOMNode();
TestUtils.scryRenderedDOMComponentsWithTag(render, 'div')[1];

expect(divWithSelectedText.textContent).to.be.equal(expectedSelectedText);
});
Expand Down
18 changes: 9 additions & 9 deletions test/theming-v12-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('Theming', () => {

let renderedAppbar = TestUtils.renderIntoDocument(<AppBar />);
let appbarDivs = TestUtils.scryRenderedDOMComponentsWithTag(renderedAppbar, 'div');
let firstDiv = appbarDivs[0].getDOMNode();
let firstDiv = appbarDivs[0];

expect(firstDiv.style.backgroundColor).to.equal('rgb(0, 188, 212)');
});
Expand All @@ -57,7 +57,7 @@ describe('Theming', () => {

let renderedAppbar = TestUtils.renderIntoDocument(<AppBarDarkUsingContext />);
let appbarDivs = TestUtils.scryRenderedDOMComponentsWithTag(renderedAppbar, 'div');
let firstDiv = appbarDivs[0].getDOMNode();
let firstDiv = appbarDivs[0];

expect(firstDiv.style.backgroundColor).to.equal('rgb(0, 151, 167)');
});
Expand All @@ -66,10 +66,10 @@ describe('Theming', () => {

let renderedAppbar = TestUtils.renderIntoDocument(<AppBarDarkUsingContextWithOverride />);
let appbarDivs = TestUtils.scryRenderedDOMComponentsWithTag(renderedAppbar, 'div');
let firstDiv = appbarDivs[0].getDOMNode();
let firstDiv = appbarDivs[0];

let appbarH1s = TestUtils.scryRenderedDOMComponentsWithTag(renderedAppbar, 'h1');
let firstH1 = appbarH1s[0].getDOMNode();
let firstH1 = appbarH1s[0];

expect(firstDiv.style.backgroundColor).to.equal('rgb(0, 151, 167)');
expect(firstH1.style.color).to.equal('rgb(98, 0, 234)');
Expand All @@ -83,7 +83,7 @@ describe('Theming', () => {

let renderedAppbar = TestUtils.renderIntoDocument(<AppBarDarkUsingDecorator />);
let appbarDivs = TestUtils.scryRenderedDOMComponentsWithTag(renderedAppbar, 'div');
let firstDiv = appbarDivs[0].getDOMNode();
let firstDiv = appbarDivs[0];

expect(firstDiv.style.backgroundColor).to.equal('rgb(0, 151, 167)');
});
Expand All @@ -92,10 +92,10 @@ describe('Theming', () => {

let renderedAppbar = TestUtils.renderIntoDocument(<AppBarDarkUsingDecoratorWithOverride />);
let appbarDivs = TestUtils.scryRenderedDOMComponentsWithTag(renderedAppbar, 'div');
let firstDiv = appbarDivs[0].getDOMNode();
let firstDiv = appbarDivs[0];

let appbarH1s = TestUtils.scryRenderedDOMComponentsWithTag(renderedAppbar, 'h1');
let firstH1 = appbarH1s[0].getDOMNode();
let firstH1 = appbarH1s[0];

expect(firstDiv.style.backgroundColor).to.equal('rgb(0, 151, 167)');
expect(firstH1.style.color).to.equal('rgb(98, 0, 234)');
Expand All @@ -109,11 +109,11 @@ describe('Theming', () => {
it('should display with updated theme', () => {
let renderedComponent = TestUtils.renderIntoDocument(<ButtonToUpdateThemeWithAppBar />);
let componentDivs = TestUtils.scryRenderedDOMComponentsWithTag(renderedComponent, 'div');
let appbarDiv = componentDivs[1].getDOMNode();
let appbarDiv = componentDivs[1];
let buttonNode = (TestUtils.scryRenderedDOMComponentsWithTag(renderedComponent, 'button'))[1];

let appbarH1s = TestUtils.scryRenderedDOMComponentsWithTag(renderedComponent, 'h1');
let firstH1 = appbarH1s[0].getDOMNode();
let firstH1 = appbarH1s[0];

expect(appbarDiv.style.backgroundColor).to.equal('rgb(0, 151, 167)');
expect(firstH1.style.color).to.equal('rgb(48, 48, 48)');
Expand Down