Support different cache keys for signed/not-signed/admin users when v…

…iewing Storefront cached pages

frontend/app/controllers/spree/store_controller.rb

@@ -41,8 +41,10 @@ def store_etag
       [
         current_store,
         current_currency,
-        I18n.locale
-      ]
+        I18n.locale,
+        try_spree_current_user.present?,
+        try_spree_current_user.try(:has_spree_role?, 'admin')
+      ].compact
     end
 
     def store_last_modified

frontend/spec/controllers/spree/store_controller_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Spree::StoreController, type: :controller do
+  describe '#store_etag' do
+    let!(:store) { create(:store, default: true, default_locale: 'es', default_currency: 'EUR') }
+
+    before { controller.send(:set_locale) }
+
+    context 'guest visitor' do
+      it do
+        expect(controller.send(:store_etag)).to eq [
+          store,
+          'EUR',
+          :es,
+          false
+        ]
+      end
+    end
+
+    context 'with signed in user' do
+      let(:user) { stub_model(Spree::LegacyUser) }
+
+      before do
+        allow(controller).to receive_messages try_spree_current_user: user
+        allow(controller).to receive_messages spree_current_user: user
+      end
+
+      context 'regular user' do
+        it do
+          expect(controller.send(:store_etag)).to eq [
+            store,
+            'EUR',
+            :es,
+            true,
+            false
+          ]
+        end
+      end
+
+      context 'admin user' do
+        before { user.spree_roles << Spree::Role.find_or_create_by(name: :admin) }
+
+        it do
+          expect(controller.send(:store_etag)).to eq [
+            store,
+            'EUR',
+            :es,
+            true,
+            true
+          ]
+        end
+      end
+    end
+  end
+end