[🚀] 2.1.3 RC (#699)

* Handling null request tags in survey webview and test.s (#698) * post 2.1.3 RC creation
kickstarter · Jan 3, 2020 · 1af7205 · 1af7205
1 parent 494a34f
commit 1af7205
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 12 deletions.
diff --git a/app/external_version_code.txt b/app/external_version_code.txt
@@ -1 +1 @@
-1912091713
+1912171853
diff --git a/app/external_version_name.txt b/app/external_version_name.txt
@@ -1 +1 @@
-2.1.2
+2.1.3
diff --git a/app/internal_version_code.txt b/app/internal_version_code.txt
@@ -1 +1 @@
-1912091713
+1912171853
diff --git a/app/internal_version_name.txt b/app/internal_version_name.txt
@@ -1 +1 @@
-2.1.2
+2.1.3
diff --git a/app/src/main/java/com/kickstarter/ui/activities/SurveyResponseActivity.java b/app/src/main/java/com/kickstarter/ui/activities/SurveyResponseActivity.java
@@ -58,7 +58,7 @@ protected void onCreate(final @Nullable Bundle savedInstanceState) {
 
   private boolean handleProjectUriRequest(final @NonNull Request request, final @NonNull WebView webView) {
     this.viewModel.inputs.projectUriRequest(request);
-    return false;
+    return true;
   }
 
   private boolean handleProjectSurveyUriRequest(final @NonNull Request request, final @NonNull WebView webView) {

diff --git a/app/src/main/java/com/kickstarter/viewmodels/SurveyResponseViewModel.java b/app/src/main/java/com/kickstarter/viewmodels/SurveyResponseViewModel.java
@@ -76,8 +76,8 @@ public ViewModel(final @NonNull Environment environment) {
      * which indicates a redirect from a successful submit.
      */
     private boolean requestTagUrlIsSurveyUrl(final @NonNull Pair<Request, String> projectRequestAndSurveyUrl) {
-      return ((Request) projectRequestAndSurveyUrl.first.tag()).url().toString()
-        .equals(projectRequestAndSurveyUrl.second);
+      final Request tag = (Request) projectRequestAndSurveyUrl.first.tag();
+      return tag == null || tag.url().toString().equals(projectRequestAndSurveyUrl.second);
     }
 
     private final PublishSubject<Void> okButtonClicked = PublishSubject.create();

diff --git a/app/src/test/java/com/kickstarter/viewmodels/SurveyResponseViewModelTest.java b/app/src/test/java/com/kickstarter/viewmodels/SurveyResponseViewModelTest.java
@@ -67,6 +67,38 @@ public void testSubmitSuccessful_Redirect_ShowConfirmationDialog() {
     this.showConfirmationDialog.assertValueCount(1);
   }
 
+  @Test
+  public void testSubmitSuccessful_NullTag_ShowConfirmationDialog() {
+    final String surveyUrl = "https://kck.str/projects/param/heyo/surveys/123";
+
+    final SurveyResponse.Urls urlsEnvelope = SurveyResponse.Urls.builder()
+      .web(SurveyResponse.Urls.Web.builder().survey(surveyUrl).build())
+      .build();
+
+    final SurveyResponse surveyResponse = SurveyResponseFactory.surveyResponse()
+      .toBuilder()
+      .urls(urlsEnvelope)
+      .build();
+
+    final Request projectSurveyRequest = new Request.Builder()
+      .url(surveyUrl)
+      .build();
+
+    final Request projectRequest = new Request.Builder()
+      .url("https://kck.str/projects/param/heyo")
+      .build();
+
+    setUpEnvironment(environment());
+    this.vm.intent(new Intent().putExtra(IntentKey.SURVEY_RESPONSE, surveyResponse));
+
+    // Survey loads. Successful submit redirects to project uri.
+    this.vm.inputs.projectSurveyUriRequest(projectSurveyRequest);
+    this.vm.inputs.projectUriRequest(projectRequest);
+
+    // Success confirmation dialog is shown.
+    this.showConfirmationDialog.assertValueCount(1);
+  }
+
   @Test
   public void testWebViewUrl() {
     final SurveyResponse surveyResponse = SurveyResponseFactory.surveyResponse();

diff --git a/fastlane/report.xml b/fastlane/report.xml
@@ -5,27 +5,27 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: Verifying fastlane version" time="0.001604">
+      <testcase classname="fastlane.lanes" name="0: Verifying fastlane version" time="0.001312">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.001249">
+      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.001558">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: build_android_app" time="43.024441">
+      <testcase classname="fastlane.lanes" name="2: build_android_app" time="39.524221">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="3: crashlytics" time="2.937905">
+      <testcase classname="fastlane.lanes" name="3: crashlytics" time="2.699301">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="4: slack" time="0.327769">
+      <testcase classname="fastlane.lanes" name="4: slack" time="0.307244">
 
       </testcase>