2c2
< index c9c19a5c30..135e011e12 100644
---
> index c894015cac..afba8709b7 100644
19c19
< -      $configuration['source']['constants']['source_base_path'] = rtrim($config['source_base_path'], '/') . '/';
---
> -      $configuration['source']['constants']['source_base_path'] = rtrim($config['source_base_path'], '/');
26c26
< +      $configuration['source']['constants']['source_base_path'] = rtrim($base_path, '/') . '/';
---
> +      $configuration['source']['constants']['source_base_path'] = rtrim($base_path, '/');
31c31
< index 75ebeb1dfb..b86a765992 100644
---
> index 4e8d621fe8..8900a50768 100644
34c34
< @@ -195,7 +195,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
---
> @@ -189,7 +189,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
56c56
< index d64b001c75..ed1b684fae 100644
---
> index 3d2f053ce1..71ca6aae1f 100644
59c59
< @@ -294,6 +294,7 @@ protected function getCredentials() {
---
> @@ -293,6 +293,7 @@ protected function getCredentials() {
67c67
< @@ -310,4 +311,33 @@ public function assertUserLogIn($uid, $pass) {
---
> @@ -309,4 +310,33 @@ public function assertUserLogIn($uid, $pass) {
103c103
< index 0000000000..6ceff1afc4
---
> index 0000000000..f4646695ab
246,247c246,247
< +    $this->drupalPostForm(NULL, [], 'Continue');
< +    $this->drupalPostForm(NULL, $edits, 'Review upgrade');
---
> +    $this->submitForm([], 'Continue');
> +    $this->submitForm($edits, 'Review upgrade');
258c258
< +    $this->drupalPostForm(NULL, [], 'Perform upgrade');
---
> +    $this->submitForm([], 'Perform upgrade');