Merged develop into master

Author: davidmigloz

app/src/test/java/com/davidmiguel/gobees/apiary/ApiaryPresenterTest.java

@@ -114,7 +114,8 @@ public void loadHives_showHivesIntoView() {
     public void loadHivesError_showMsg() {
         // Given an initialized ApiaryPresenter
         // When loading of apiaries is requested
-        apiaryPresenter.start();
+        apiaryPresenter.start(); // Hive list fragment
+        apiaryPresenter.start(); // Info fragment
         // Callback is captured and invoked with stubbed apiaries
         verify(goBeesRepository).getApiary(anyLong(), getApiaryCallbackArgumentCaptor.capture());
         getApiaryCallbackArgumentCaptor.getValue().onDataNotAvailable();

app/src/test/java/com/davidmiguel/gobees/hive/HivePresenterTest.java

@@ -103,12 +103,11 @@ public void setupMocksAndView() {
     public void loadRecordings_showRecordingsIntoView() {
         // Given an initialized HivePresenter
         // When loading of recordings is requested
-        hivePresenter.start();
-
+        hivePresenter.start(); // Recordings list fragment
+        hivePresenter.start(); // Info fragment
         // Callback is captured and invoked with stubbed hives
         verify(goBeesRepository).getHiveWithRecordings(anyLong(), getHiveCallbackArgumentCaptor.capture());
         getHiveCallbackArgumentCaptor.getValue().onHiveLoaded(HIVE);
-
         // Then progress indicator is shown
         InOrder inOrder = inOrder(hiveRecordingsView);
         // Then progress indicator is hidden and all hives are shown in UI
@@ -124,7 +123,8 @@ public void loadRecordings_showRecordingsIntoView() {
     public void loadRecordingsError_showMsg() {
         // Given an initialized HivePresenter
         // When loading of recordings is requested
-        hivePresenter.start();
+        hivePresenter.start(); // Recordings list fragment
+        hivePresenter.start(); // Info fragment
         // Callback is captured and invoked with stubbed hives
         verify(goBeesRepository).getHiveWithRecordings(anyLong(),
                 getHiveCallbackArgumentCaptor.capture());