Merge branch 'fix-master-spec' into 'master'

Fix a spec that was failing due to !3483 Spec were skipped in this MR so that tests started to fail in master instead of in this MR! /cc @connorshea @rspeicher See merge request !4033

Merge branch 'fix-master-spec' into 'master'
0067ca5b · Rémy Coutable · 450ea01d · 5f89c964 · 0067ca5b
Commit 0067ca5b authored May 04, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

login_spec.rb spec/features/login_spec.rb +1 -1

No files found.
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -37,7 +37,7 @@ feature 'Login', feature: true do
      end

      def enter_code(code)
-        fill_in 'Two-factor authentication code', with: code
+        fill_in 'Two-factor Authentication code', with: code
        click_button 'Verify code'
      end