Merge pull request #3001 from thmq/0.9.42_StringUpdate

[RELEASE] Fix issues with missing strings, increased version code.
Catrobat · Oct 15, 2018 · eddae26 · eddae26
2 parents e8dcd34 + 5997b70
commit eddae26
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/catroid/build.gradle b/catroid/build.gradle
@@ -111,7 +111,7 @@ android {
         targetSdkVersion 22
         applicationId appId
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
-        versionCode 49
+        versionCode 50
         println "VersionCode is $versionCode"
         versionName "0.9.42"
         println "VersionName is $versionName"

diff --git a/...idTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java b/...idTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetBackgroundBrickTest.java
@@ -76,7 +76,7 @@ public void testSetBackgroundBrickMediaLibraryUrl() {
 		onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_background);
 
 		onBrickAtPosition(brickPosition).onSpinner(R.id.brick_set_look_spinner)
-				.performSelectNameable(R.string.brick_variable_spinner_create_new_variable);
+				.performSelectNameable(R.string.new_option);
 
 		Intents.init();
 

diff --git a/.../androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java b/.../androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/SetLookBrickTest.java
@@ -76,7 +76,7 @@ public void testSetLookBrickMediaLibraryUrl() {
 		onBrickAtPosition(brickPosition).checkShowsText(R.string.brick_set_look);
 
 		onBrickAtPosition(brickPosition).onSpinner(R.id.brick_set_look_spinner)
-				.performSelectNameable(R.string.brick_variable_spinner_create_new_variable);
+				.performSelectNameable(R.string.new_option);
 
 		Intents.init();
 

diff --git a/...androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java b/...androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/VariableBrickTest.java
@@ -109,7 +109,7 @@ public void testNewVariableCanceling() {
 		onBrickAtPosition(setBrickPosition).onVariableSpinner(R.id.set_variable_spinner)
 				.perform(click());
 
-		onView(withText(R.string.brick_variable_spinner_create_new_variable))
+		onView(withText(R.string.new_option))
 				.perform(click());
 
 		closeSoftKeyboard();