From d6477b279b5fac1fa5a816d28a39937dc06daa8e Mon Sep 17 00:00:00 2001 From: Maks Kudlyak Date: Mon, 2 Dec 2019 09:47:42 +0200 Subject: [PATCH 1/3] testID added --- AppIntroSlider.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/AppIntroSlider.js b/AppIntroSlider.js index 4708763..e3c365f 100644 --- a/AppIntroSlider.js +++ b/AppIntroSlider.js @@ -36,6 +36,7 @@ export default class AppIntroSlider extends React.Component { paginationStyle: null, showDoneButton: true, showNextButton: true, + testID: testID => ({ testID }), }; state = { width, @@ -117,6 +118,7 @@ export default class AppIntroSlider extends React.Component { }; _renderOuterButton = (content, name, onPress) => { + const { testID } = this.props; const style = name === 'Skip' || name === 'Prev' ? styles.leftButtonContainer : styles.rightButtonContainer; return ( @@ -124,6 +126,7 @@ export default class AppIntroSlider extends React.Component { {content} @@ -151,6 +154,8 @@ export default class AppIntroSlider extends React.Component { (!isFirstSlide && this._renderPrevButton()) || (!isLastSlide && this._renderSkipButton()); const btn = isLastSlide ? this._renderDoneButton() : this._renderNextButton(); + const { testID } = this.props; + return ( @@ -165,6 +170,7 @@ export default class AppIntroSlider extends React.Component { : this.props.dotStyle, ]} onPress={() => this._onPaginationPress(i)} + {testID(`page_${i}`)} /> ))} From 107c46e140db4c60f26c0991ba9662de1279b067 Mon Sep 17 00:00:00 2001 From: Maks Kudlyak Date: Mon, 2 Dec 2019 11:37:32 +0200 Subject: [PATCH 2/3] fixed JSX --- AppIntroSlider.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AppIntroSlider.js b/AppIntroSlider.js index e3c365f..8995db7 100644 --- a/AppIntroSlider.js +++ b/AppIntroSlider.js @@ -126,7 +126,7 @@ export default class AppIntroSlider extends React.Component { {content} @@ -170,7 +170,7 @@ export default class AppIntroSlider extends React.Component { : this.props.dotStyle, ]} onPress={() => this._onPaginationPress(i)} - {testID(`page_${i}`)} + {...testID(`page_${i}`)} /> ))} From 5f8e29bececb237095b2c7ee627635964f080f95 Mon Sep 17 00:00:00 2001 From: Max Kudlyak <32055535+max-kim@users.noreply.github.com> Date: Mon, 2 Dec 2019 14:07:35 +0200 Subject: [PATCH 3/3] Update AppIntroSlider.js resolve name conflict with native modules --- AppIntroSlider.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AppIntroSlider.js b/AppIntroSlider.js index 8995db7..22fe164 100644 --- a/AppIntroSlider.js +++ b/AppIntroSlider.js @@ -36,7 +36,7 @@ export default class AppIntroSlider extends React.Component { paginationStyle: null, showDoneButton: true, showNextButton: true, - testID: testID => ({ testID }), + testId: testID => ({ testID }), }; state = { width, @@ -118,7 +118,7 @@ export default class AppIntroSlider extends React.Component { }; _renderOuterButton = (content, name, onPress) => { - const { testID } = this.props; + const { testId } = this.props; const style = name === 'Skip' || name === 'Prev' ? styles.leftButtonContainer : styles.rightButtonContainer; return ( @@ -126,7 +126,7 @@ export default class AppIntroSlider extends React.Component { {content} @@ -154,7 +154,7 @@ export default class AppIntroSlider extends React.Component { (!isFirstSlide && this._renderPrevButton()) || (!isLastSlide && this._renderSkipButton()); const btn = isLastSlide ? this._renderDoneButton() : this._renderNextButton(); - const { testID } = this.props; + const { testId } = this.props; return ( @@ -170,7 +170,7 @@ export default class AppIntroSlider extends React.Component { : this.props.dotStyle, ]} onPress={() => this._onPaginationPress(i)} - {...testID(`page_${i}`)} + {...testId(`page_${i}`)} /> ))}