Merge remote-tracking branch 'upstream/pull/4434'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fa10f018f8de2283a1e212cc09123a936eda738b..14e9b5c442373e6e0f39b0999011c259ffa6b3cc 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2683,6 +2683,7 @@ en:
       application: "Application"
       permissions: "Permissions"
       no_applications_html: "You have not yet authorized any %{oauth2} applications."
+      oauth_2: "OAuth 2"
     application:
       revoke: "Revoke Access"
       confirm_revoke: "Revoke access for this application?"

diff --git a/test/system/oauth2_test.rb b/test/system/oauth2_test.rb
new file mode 100644 (file)
index 0000000..ab49640
--- /dev/null
+++ b/test/system/oauth2_test.rb
@@ -0,0 +1,10 @@
+require "application_system_test_case"
+
+class Oauth2Test < ApplicationSystemTestCase
+  def test_authorized_applications
+    sign_in_as(create(:user))
+    visit oauth_authorized_applications_path
+
+    assert_text "You have not yet authorized any OAuth 2 applications."
+  end
+end