Skip to content

Commit 12fb822

Browse files
committed
tests fixed
1 parent 66c4f26 commit 12fb822

File tree

10 files changed

+56
-38
lines changed

10 files changed

+56
-38
lines changed

components/SLDSLookup/index.jsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,14 @@ class SLDSLookup extends React.Component {
204204
}
205205

206206
getFooter () {
207-
const Footer = this.props.footerRenderer;
208-
return <Footer ref='footer' {... this.props}
209-
focusIndex={this.state.focusIndex}
210-
listLength={this.state.listLength}
211-
onClose={this.handleClose.bind(this)}
212-
/>;
207+
if(this.props.footerRenderer){
208+
const Footer = this.props.footerRenderer;
209+
return <Footer ref='footer' {... this.props}
210+
focusIndex={this.state.focusIndex}
211+
listLength={this.state.listLength}
212+
onClose={this.handleClose.bind(this)}
213+
/>;
214+
}
213215
}
214216

215217
//=================================================

demo/pages/HomePage/LookupBaseDynamicSection.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ module.exports = React.createClass( {
5959
<div className="slds-p-around--medium">
6060
Dynamic list
6161
<div className="slds-p-vertical--large">
62+
6263
<SLDSLookup
6364
items={this.state.items}
6465
label="Accounts"
6566
type="account"
6667
onChange={this.onChange}
67-
onItemSelect={this.selectItem}
6868
onItemSelect={this.handleItemSelect}
6969
/>
70+
7071
</div>
7172

7273
</div>

demo/static/bundle.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/design-system-react.js

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/design-system-react.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/design-system-react.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/design-system-react.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/SLDSLookup/index.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,14 @@ var SLDSLookup = (function (_React$Component) {
263263
}, {
264264
key: 'getFooter',
265265
value: function getFooter() {
266-
var Footer = this.props.footerRenderer;
267-
return _react2['default'].createElement(Footer, _extends({ ref: 'footer' }, this.props, {
268-
focusIndex: this.state.focusIndex,
269-
listLength: this.state.listLength,
270-
onClose: this.handleClose.bind(this)
271-
}));
266+
if (this.props.footerRenderer) {
267+
var Footer = this.props.footerRenderer;
268+
return _react2['default'].createElement(Footer, _extends({ ref: 'footer' }, this.props, {
269+
focusIndex: this.state.focusIndex,
270+
listLength: this.state.listLength,
271+
onClose: this.handleClose.bind(this)
272+
}));
273+
}
272274
}
273275

274276
//=================================================

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "design-system-react",
3-
"version": "0.0.18",
3+
"version": "0.0.19",
44
"description": "Salesforce Lightning Design System React components",
55
"scripts": {
66
"start": "node server.js",

tests/SLDSLookup/lookup.test.jsx

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,39 @@ describe('SLDSLookup: ', function(){
1313
{label:'Acme Construction'}
1414
];
1515

16-
let generateLookup = function(lookupInstance) {
16+
const generateLookup = function(lookupInstance) {
1717
let reactCmp = TestUtils.renderIntoDocument(lookupInstance);
1818
return React.findDOMNode(reactCmp);
1919
};
2020

21+
const getLookup = function(withHeader) {
22+
return <SLDSLookup
23+
items={items}
24+
label="Leads"
25+
type="lead"
26+
headerRenderer={withHeader?SLDSLookup.DefaultHeader:null}
27+
footerRenderer={SLDSLookup.DefaultFooter}
28+
/>;
29+
};
30+
2131
describe('component renders', function() {
2232
it('lookup renders', function() {
23-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
33+
let lookup = generateLookup(getLookup());
2434
expect(lookup).to.not.equal(undefined);
2535
});
2636
});
2737

2838
describe('component basic props render', function() {
2939
it('renders label', function() {
30-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
40+
let lookup = generateLookup(getLookup());
3141
let label = lookup.getElementsByTagName("label")[0];
3242
expect(label.innerText).to.equal('Leads');
3343
});
3444
});
3545

3646
describe('accessibility markup passes', function() {
3747
it('label for matches input id', function() {
38-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
48+
let lookup = generateLookup(getLookup());
3949
let labelFor = lookup.getElementsByTagName("label")[0].getAttribute("for");
4050
let inputId = lookup.getElementsByTagName("input")[0].getAttribute("id");
4151
expect(labelFor).to.equal(inputId);
@@ -45,18 +55,18 @@ describe('SLDSLookup: ', function(){
4555

4656
describe('accessibility aria attributes pass', function() {
4757
it('aria-haspopup is true', function() {
48-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
58+
let lookup = generateLookup(getLookup());
4959
let ariaHaspopup = lookup.getElementsByTagName("input")[0].getAttribute("aria-haspopup");
5060
expect(ariaHaspopup).to.equal('true');
5161
});
5262
it('aria-expanded is false initally', function() {
53-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
63+
let lookup = generateLookup(getLookup());
5464
let ariaExpanded = lookup.getElementsByTagName("input")[0].getAttribute("aria-expanded");
5565
expect(ariaExpanded).to.equal('false');
5666
});
5767

5868
it('aria-expanded is true when clicking on input field', function() {
59-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
69+
let lookup = generateLookup(getLookup());
6070
let input = lookup.getElementsByTagName("input")[0];
6171
TestUtils.Simulate.click(input);
6272
let ariaExpanded = lookup.getElementsByTagName("input")[0].getAttribute("aria-expanded");
@@ -68,7 +78,7 @@ describe('SLDSLookup: ', function(){
6878
describe('selecting item works', function() {
6979

7080
it('no fixed header: focuses correct item', function() {
71-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
81+
let lookup = generateLookup(getLookup());
7282
let input = lookup.getElementsByTagName("input")[0];
7383
TestUtils.Simulate.click(input);
7484
TestUtils.Simulate.keyDown(input, {key: "Down", keyCode: 40, which: 40});
@@ -78,7 +88,7 @@ describe('SLDSLookup: ', function(){
7888
});
7989

8090
it('with fixed header: focuses correct item', function() {
81-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" header={<div>header</div>}/>);
91+
let lookup = generateLookup(getLookup(true));
8292
let input = lookup.getElementsByTagName("input")[0];
8393
TestUtils.Simulate.click(input);
8494
TestUtils.Simulate.keyDown(input, {key: "Down", keyCode: 40, which: 40});
@@ -88,7 +98,7 @@ describe('SLDSLookup: ', function(){
8898
});
8999

90100
it('selects correct item', function() {
91-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
101+
let lookup = generateLookup(getLookup());
92102
let input = lookup.getElementsByTagName("input")[0];
93103
TestUtils.Simulate.click(input);
94104
TestUtils.Simulate.keyDown(input, {key: "Down", keyCode: 40, which: 40});
@@ -100,7 +110,7 @@ describe('SLDSLookup: ', function(){
100110
});
101111

102112
it('closes lookup menu on esc', function() {
103-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
113+
let lookup = generateLookup(getLookup());
104114
let input = lookup.getElementsByTagName("input")[0];
105115
TestUtils.Simulate.click(input);
106116
TestUtils.Simulate.keyDown(input, {key: "Down", keyCode: 40, which: 40});
@@ -110,7 +120,7 @@ describe('SLDSLookup: ', function(){
110120
});
111121

112122
it('aria-expanded is false after selecting item', function() {
113-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
123+
let lookup = generateLookup(getLookup());
114124
let input = lookup.getElementsByTagName("input")[0];
115125
TestUtils.Simulate.click(input);
116126
TestUtils.Simulate.keyDown(input, {key: "Down", keyCode: 40, which: 40});
@@ -119,13 +129,14 @@ describe('SLDSLookup: ', function(){
119129
});
120130

121131
it('aria-expanded is false after selecting item', function() {
122-
let lookup = generateLookup(<SLDSLookup items={items} label="Leads" type="lead" />);
132+
let lookup = generateLookup(getLookup());
123133
let input = lookup.getElementsByTagName("input")[0];
124134
TestUtils.Simulate.click(input);
125135
TestUtils.Simulate.keyDown(input, {key: "Down", keyCode: 40, which: 40});
126136
let focusedItem = lookup.getElementsByTagName("ul")[0].getElementsByTagName('li')[0];
127137
expect(focusedItem.className).to.have.string('slds-theme--shade');
128138
});
139+
129140
});
130141

131142
});

0 commit comments

Comments
 (0)