Merge 5f08d91 into 2d9565a

src/__tests__/components/request-page/RequestPage.test.js

@@ -646,6 +646,11 @@ describe("<request page />", () => {
     wrapper.setProps({ user: {} });
   });
 
+  it('it should test for the populate request page with props new', () => {
+    wrapper = shallow(<SingleRequestComponent {...props} />);
+    wrapper.setProps({ user: {}, match: { params: { id: "new" } } });
+  });
+
   it('should test for the new request', () => {
     props.match.params.id = "new";
     wrapper = shallow(<RequestPage {...props} />);
@@ -697,8 +702,6 @@ describe("<request page />", () => {
   });
 
   it('should test for submit a multi city request', () => {
-    props.match.params.id = "new";
-
     const data = {
       request_type: 'OneWay',
       location_id: 1,

src/__tests__/components/user-requests/UserRequests.test.js

@@ -15,6 +15,7 @@ import UserRequests, {
 } from "../../../components/user-requests/UserRequests";
 import successresponse from "../../../__mocks__/__get_user_request_success__.json";
 import { fromJS } from "immutable";
+import { mapStateToProps } from '../../../components/user-requests/UserRequests';
 
 Enzyme.configure({ adapter: new Adapter() });
 const mockedStore = configureStore([thunk]);
@@ -246,6 +247,17 @@ describe("User Requests View", () => {
 
     select.simulate("change", target);
   });
+
+  it('test mapstate to props ', () => {
+  const state = {
+    Requests: {},
+    searchRequests: {},
+    errors: {},
+    profile: { user: {}}
+  }
+
+    mapStateToProps(state);
+  });
 });
 describe("User Requests View mapStateToProps", () => {
   it("should cover mapStateToProps errors case in User Requests view", () => {

src/components/single-request/SingleRequest.jsx

@@ -43,6 +43,7 @@ export class SingleRequest extends Component {
         <SideBar userRole={this.state.user.role_value} />
         <div className="content-container">
           <RequestPage />
+          {id === "new" ? null : (<Comment requestId={id} owner={this.state.user.id} />)}
         </div>
         <Footer />
       </div>

src/components/user-requests/UserRequests.js

@@ -175,7 +175,8 @@ export class UserRequests extends Component {
     );
   }
 }
-const mapStateToProps = (state) => ({
+
+export const mapStateToProps = (state) => ({
   requests: state.Requests,
   searchRequests: state.searchRequests,
   errors: state.errors,