Revert "Merge pull request #71 from wednesday-solutions/feat/notifica…

…tion_service_test"

This reverts commit bc9071d, reversing
changes made to c62a339.

app/navigators/AppNavigator.js

@@ -3,7 +3,7 @@ import { createStackNavigator } from '@react-navigation/stack';
 import SplashScreen from '@scenes/SplashScreen/';
 import ExampleScreen from '@scenes/ExampleScreen';
 import { NavigationContainer } from '@react-navigation/native';
-import { setTopLevelNavigator } from '../services/NavigationService';
+import NavigationService from '../services/NavigationService';
 const Stack = createStackNavigator();
 /**
  * The root screen contains the application's navigation.
@@ -12,7 +12,7 @@ const Stack = createStackNavigator();
  */
 export default function AppNavigator() {
   return (
-    <NavigationContainer ref={setTopLevelNavigator}>
+    <NavigationContainer ref={NavigationService.setTopLevelNavigator}>
       <Stack.Navigator headerMode="none" initialRouteName="SplashScreen">
         <Stack.Screen name="SplashScreen" component={SplashScreen} />
         <Stack.Screen name="MainScreen" component={ExampleScreen} />

app/scenes/RootScreen/index.js

@@ -2,9 +2,10 @@ import { connect } from 'react-redux';
 import { PropTypes } from 'prop-types';
 import AppNavigator from '@navigators/AppNavigator';
 import Container from '@atoms/Container';
+
 import { rootScreenActions } from './reducer';
 import React, { useEffect } from 'react';
-import { setRefForTopLevelNavigtor } from '@app/services/NavigationService';
+import setRefForTopLevelNavigtor from '@app/services/NavigationService';
 
 const RootScreen = props => {
   useEffect(() => {

app/scenes/RootScreen/saga.js

@@ -1,12 +1,12 @@
 import { takeLatest } from 'redux-saga/effects';
-import { navigateAndReset } from '@app/services/NavigationService';
+import NavigationService from '@app/services/NavigationService';
 import { rootScreenTypes } from './reducer';
 
 /**
  * The startup saga is the place to define behavior to execute when the application starts.
  */
 export function* startup() {
-  setTimeout(() => navigateAndReset('MainScreen'), 1000);
+  setTimeout(() => NavigationService.navigateAndReset('MainScreen'), 1000);
 }
 
 /**

app/scenes/RootScreen/tests/saga.test.js

@@ -1,27 +1,16 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 /**
  * Test sagas
  */
 
 /* eslint-disable redux-saga/yield-effects */
 
 import { takeLatest } from 'redux-saga/effects';
-// import NavigationService from 'app/services/NavigationService';
-import { navigateAndReset } from '@app/services/NavigationService';
+import NavigationService from 'app/services/NavigationService';
 import { timeout } from 'app/utils/testUtils';
 import rootScreenSaga, { startup } from '../saga';
 import { rootScreenTypes } from '../reducer';
 import set from 'lodash/set';
-
-const NavigationService = '@app/services/NavigationService';
-jest.mock('@app/services/NavigationService', () => ({
-  ...jest.requireActual('@app/services/NavigationService'),
-  navigateAndReset: jest.fn()
-}));
 describe('Tests for RootScreen sagas', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
   const setupTests = () => ({
     generator: rootScreenSaga(),
     submitSpy: jest.fn()
@@ -36,10 +25,15 @@ describe('Tests for RootScreen sagas', () => {
 
   it('should ensure that the navigation service is called after waiting for 1000ms', async () => {
     const method = startup();
+    NavigationService.setTopLevelNavigator({ dispatch: () => {} });
+    const navigateAndResetSpy = jest.spyOn(
+      NavigationService,
+      'navigateAndReset'
+    );
     method.next();
     await timeout(1000);
-    expect(navigateAndReset).toHaveBeenCalled();
-    expect(navigateAndReset).toHaveBeenCalledWith('MainScreen');
+    expect(navigateAndResetSpy).toHaveBeenCalled();
+    expect(navigateAndResetSpy).toHaveBeenCalledWith('MainScreen');
   });
 
   it('should ensure that the navigation service is called after waiting for 1000ms', async () => {

app/services/NavigationService.js

@@ -50,4 +50,8 @@ function navigateAndReset(routeName, params) {
   );
 }
 
-export { navigate, navigateAndReset, setTopLevelNavigator };
+export default {
+  navigate,
+  navigateAndReset,
+  setTopLevelNavigator
+};

app/services/tests/UserService.test.js → app/services/UserService.test.js

@@ -1,6 +1,6 @@
 import MockAdapter from 'axios-mock-adapter';
 import { getApiClient } from 'app/utils/apiUtils';
-import { getUser } from '../UserService';
+import { getUser } from './UserService';
 
 describe('UserService tests', () => {
   it('should make the api call to "/quotes?count=1"', async () => {