Merge pull request #41 from onap-sdc/master

merge
onap-sdc · Feb 13, 2019 · 0eb910a · 0eb910a
2 parents 43744fb + 799d417
commit 0eb910a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sdc-ui",
-  "version": "1.6.61",
+  "version": "1.6.62",
   "description": "This project aims to create a unified UI styled components for multiple development teams who work on the same web-based applications.",
   "scripts": {
     "test": "jest && npm run karma-travis",

diff --git a/src/react/ModalFooter.js b/src/react/ModalFooter.js
@@ -8,7 +8,9 @@ const Footer = ({
     actionButtonText,
     actionButtonClick,
     withButtons,
-    children
+    children,
+    confirmDataTestId,
+    cancelDataTestId
 }) => {
     const closeBtnType = actionButtonClick ? 'secondary' : 'primary';
     return (
@@ -17,11 +19,16 @@ const Footer = ({
             {withButtons && (
                 <div>
                     {actionButtonClick && (
-                        <Button onClick={actionButtonClick}>
+                        <Button
+                            onClick={actionButtonClick}
+                            data-test-id={confirmDataTestId}>
                             {actionButtonText}
                         </Button>
                     )}
-                    <Button btnType={closeBtnType} onClick={onClose}>
+                    <Button
+                        btnType={closeBtnType}
+                        onClick={onClose}
+                        data-test-id={cancelDataTestId}>
                         {closeButtonText}
                     </Button>
                 </div>
@@ -36,7 +43,9 @@ Footer.propTypes = {
     actionButtonText: PropTypes.string,
     actionButtonClick: PropTypes.func,
     withButtons: PropTypes.bool,
-    children: PropTypes.node
+    children: PropTypes.node,
+    confirmDataTestId: PropTypes.string,
+    cancelDataTestId: PropTypes.string
 };
 
 Footer.defaultProps = {

diff --git a/test/react/__snapshots__/ModalFooter.spec.js.snap b/test/react/__snapshots__/ModalFooter.spec.js.snap
@@ -7,6 +7,7 @@ exports[`ModalFooter basic test 1`] = `
   <div>
     <button
       className="sdc-button sdc-button__primary   "
+      data-test-id={undefined}
       disabled={false}
       onClick={undefined}
     >