Merge b72d1fa into b59f727

app/controllers/concerns/cms/for_member_filter/node.rb

@@ -9,6 +9,6 @@ module Cms::ForMemberFilter::Node
   private
 
   def for_member_enabled?
-    @cur_node.try(:for_member_enabled?)
+    @cur_node.try(:for_member_enabled?) && !@preview
   end
 end

app/controllers/concerns/cms/for_member_filter/page.rb

@@ -9,6 +9,6 @@ module Cms::ForMemberFilter::Page
   private
 
   def for_member_enabled?
-    @cur_page.try(:for_member_enabled?)
+    @cur_page.try(:for_member_enabled?) && !@preview
   end
 end

spec/features/cms/pages/for_member_page_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe "cms/pages", type: :feature, dbscope: :example do
+  let(:site) { cms_site }
+  let(:node) { create :cms_node_node, filename: "node" }
+  let(:item) { create :cms_page, cur_node: node, basename: 'page' }
+  let!(:member_login_node) { create :member_node_login }
+  let(:show_path) { node_page_path site.id, node.id, item.id }
+
+  context "with for member state" do
+    before do
+      node.for_member_state = 'enabled'
+      node.save!
+      login_cms_user
+    end
+
+    it "public" do
+      visit show_path
+      expect(status_code).to eq 200
+
+      click_link item.full_url
+      expect(status_code).to eq 200
+      expect(current_path).to eq "#{member_login_node.url}login.html"
+    end
+
+    it "preview" do
+      visit show_path
+      expect(status_code).to eq 200
+
+      click_link I18n.t("cms.preview_pc_page")
+      expect(status_code).to eq 200
+      expect(current_path).to eq cms_preview_path(site.id, path: item.preview_path)
+    end
+  end
+end