From c9c81933afad43777476948238933f7269e4aaa0 Mon Sep 17 00:00:00 2001 From: Hammad Khalid Date: Mon, 26 Jun 2017 14:49:29 -0400 Subject: [PATCH 1/2] Remove login message --- config/locales/de.yml | 1 - config/locales/en.yml | 1 - config/locales/es.yml | 1 - config/locales/fr.yml | 1 - config/locales/ja.yml | 1 - lib/shopify_app/sessions_concern.rb | 1 - 6 files changed, 6 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 33da63ae7..e84f80415 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1,4 +1,3 @@ de: - logged_in: 'Eingeloggt' logged_out: 'Erfolgreich ausgelogt' could_not_log_in: 'Shopify Store Login fehlgeschlagen' diff --git a/config/locales/en.yml b/config/locales/en.yml index ec7f97aad..029075d67 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,4 +1,3 @@ en: - logged_in: 'Logged In' logged_out: 'Successfully logged out' could_not_log_in: 'Could not log in to Shopify store' diff --git a/config/locales/es.yml b/config/locales/es.yml index d4476a90d..cdbeb5a18 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,4 +1,3 @@ es: - logged_in: 'Has iniciado sesión' logged_out: 'Cerrar sesión' could_not_log_in: 'No se pudo iniciar sesión en tu tienda de Shopify' diff --git a/config/locales/fr.yml b/config/locales/fr.yml index a857fae13..2e6469075 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,4 +1,3 @@ fr: - logged_in: 'Vous êtes connecté(e)' logged_out: 'Vous êtes déconnecté(e)' could_not_log_in: 'Impossible de se connecter à la boutique Shopify' diff --git a/config/locales/ja.yml b/config/locales/ja.yml index f9b8700fe..50805860a 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1,4 +1,3 @@ ja: - logged_in: 'ログイン' logged_out: 'ログインに成功しました' could_not_log_in: 'Shopifyストアにログインできませんでした' diff --git a/lib/shopify_app/sessions_concern.rb b/lib/shopify_app/sessions_concern.rb index be989631e..384310d51 100644 --- a/lib/shopify_app/sessions_concern.rb +++ b/lib/shopify_app/sessions_concern.rb @@ -21,7 +21,6 @@ def callback install_webhooks install_scripttags - flash[:notice] = I18n.t('.logged_in') redirect_to return_address else flash[:error] = I18n.t('could_not_log_in') From 826856fa4b89c3806f0825a706aeee7bf1a884ce Mon Sep 17 00:00:00 2001 From: Hammad Khalid Date: Mon, 26 Jun 2017 14:51:42 -0400 Subject: [PATCH 2/2] Remove old tests --- test/controllers/sessions_controller_test.rb | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index 8a22be7d1..31fca152e 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -84,21 +84,6 @@ class SessionsControllerTest < ActionController::TestCase assert_redirected_to '/' end - test '#callback should have a success flash message' do - mock_shopify_omniauth - - get :callback, params: { shop: 'shop' } - assert_equal flash[:notice], 'Logged In' - end - - test '#callback should have a success flash message in Spanish' do - I18n.locale = :es - mock_shopify_omniauth - - get :callback, params: { shop: 'shop' } - assert_equal flash[:notice], 'Has iniciado sesión' - end - test '#callback should flash error when omniauth is not present' do get :callback, params: { shop: 'shop' } assert_equal flash[:error], 'Could not log in to Shopify store'