Skip to content

Commit df6e1aa

Browse files
authored
chore: Update Travis config for bs3-dev (react-bootstrap#4564)
2 parents c9a5a78 + 51b9632 commit df6e1aa

File tree

9 files changed

+31
-26
lines changed

9 files changed

+31
-26
lines changed

.travis.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
sudo: false
2-
31
language: node_js
42
node_js:
5-
- '9'
3+
- node
4+
5+
jobs:
6+
include:
7+
- addons:
8+
chrome: stable
9+
env: BROWSER=ChromeCi
10+
- addons:
11+
firefox: latest
12+
env: BROWSER=Firefox
613

7-
env:
8-
- BROWSER=ChromeCi
9-
- BROWSER=Firefox
14+
services:
15+
- xvfb
1016

1117
cache:
18+
yarn: true
19+
npm: true
1220
directories:
13-
- ~/.yarn-cache
14-
- node_modules
1521
- www/node_modules
1622

17-
before_install:
18-
- export CHROME_BIN=chromium-browser
19-
- export DISPLAY=:99.0
20-
- sh -e /etc/init.d/xvfb start
21-
2223
install:
2324
- yarn bootstrap
2425

25-
after_success:
26+
after_script:
2627
- node_modules/.bin/codecov
2728

2829
branches:
2930
only:
3031
- master
31-
- next
32+
- bs3-dev

src/PaginationItem.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ PaginationItem.defaultProps = defaultProps;
4646
function createButton(name, defaultValue, label = name) {
4747
return class extends React.Component {
4848
static displayName = name;
49+
4950
static propTypes = { disabled: PropTypes.bool };
51+
5052
render() {
5153
const { disabled, children, className, ...props } = this.props;
5254
const Component = disabled ? 'span' : SafeAnchor;

test/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
import Enzyme, { ShallowWrapper, ReactWrapper } from 'enzyme';
2+
import Adapter from 'enzyme-adapter-react-16';
13
import deprecated from 'prop-types-extra/lib/deprecated';
24

35
import { _resetWarned } from '../src/utils/deprecationWarning';
46

5-
import Enzyme, { ShallowWrapper, ReactWrapper } from 'enzyme';
6-
import Adapter from 'enzyme-adapter-react-16';
7-
87
Enzyme.configure({ adapter: new Adapter() });
98

109
function assertLength(length) {

www/src/components/NavMain.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ function NavMain({ activePage }) {
6767

6868
<Nav pullRight>
6969
<NavDropdown title={`v${config.version}`} id="version-dropdown">
70-
<MenuItem href="https://react-bootstrap.netlify.com">React-Bootstrap for Bootstrap 4</MenuItem>
70+
<MenuItem href="https://react-bootstrap.netlify.com">
71+
React-Bootstrap for Bootstrap 4
72+
</MenuItem>
7173
</NavDropdown>
7274
<NavItem href="https://getbootstrap.com/docs/3.3/css/">
7375
Supports Bootstrap v{config.bootstrapVersion}

www/src/components/PropTable.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ class PropTable extends React.Component {
3737
getDisplayTypeName(typeName) {
3838
if (typeName === 'func') {
3939
return 'function';
40-
} else if (typeName === 'bool') {
40+
}
41+
if (typeName === 'bool') {
4142
return 'boolean';
4243
}
4344

www/src/examples/FormBasic.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class FormExample extends React.Component {
1212
getValidationState() {
1313
const length = this.state.value.length;
1414
if (length > 10) return 'success';
15-
else if (length > 5) return 'warning';
16-
else if (length > 0) return 'error';
15+
if (length > 5) return 'warning';
16+
if (length > 0) return 'error';
1717
return null;
1818
}
1919

www/src/examples/ModalContained.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class Trigger extends React.Component {
2323
handleHide() {
2424
this.setState({ show: false });
2525
}
26+
2627
render() {
2728
return (
2829
<div className="modal-container" style={{ height: 200 }}>

www/src/examples/ModalDefaultSizing.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ class App extends React.Component {
141141
lgShow: false
142142
};
143143
}
144+
144145
render() {
145146
let smClose = () => this.setState({ smShow: false });
146147
let lgClose = () => this.setState({ lgShow: false });

www/src/pages/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22

3-
import Button from 'react-bootstrap/lib/Button'
3+
import Button from 'react-bootstrap/lib/Button';
44

55
export default class HomePage extends React.Component {
66
render() {
@@ -12,9 +12,7 @@ export default class HomePage extends React.Component {
1212
The most popular front-end framework, rebuilt for React.
1313
</p>
1414
<Button>
15-
<a href="/components/alerts/">
16-
Discover Components
17-
</a>
15+
<a href="/components/alerts/">Discover Components</a>
1816
</Button>
1917
</div>
2018
</main>

0 commit comments

Comments
 (0)