refinerycms-pages 2.1.4 → 2.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0332a4b120232ed99eba9f9bbe80a0604133a5a5
4
- data.tar.gz: 49119204d3633909f8d3e42064765a1b9f2c968e
3
+ metadata.gz: 7ca74af9b5248a8313eba585323664f7421241c9
4
+ data.tar.gz: a6940067a4a5686a4045cea92e156185cb2ba370
5
5
  SHA512:
6
- metadata.gz: b27632ff9f45fe08ac93bdffa15df084c36fac3110e20ed67f0b5bb631e08d42f4d5fd88635e6e08b62b8320dc8caf9f1214c80abd4def8d355456253cf6021d
7
- data.tar.gz: b9fdf61a3893cb839588fa44b7ddecfebbea4ff1df547bd243be733a2b3d35da31ca5eccb179fbcc909f87bf903a35b7d0b74de17c971fdd10edbceed6823039
6
+ metadata.gz: a2b2acb0803208475af177019dc732e90ab5c29c6ea16ba8113bfe8c972f2b2918bed991de0bfbdec5c1b16dbb54b04b6c58ffb17f7cda8d38dc515f3216bdee
7
+ data.tar.gz: fd54a6aaad887e98d79ce2485ba77d53294b7f7397cb2ee2be1da52182c05ce5ef35b80a0f93a01edc1fb86a690b7153b9f5627fd273828f1dc3d87efb0fc93b
@@ -1,11 +1,14 @@
1
1
  module Refinery
2
2
  module Pages
3
3
  module Admin
4
- class PreviewController < AdminController
5
- include Pages::InstanceMethods
4
+ class PreviewController < Refinery::PagesController
5
+ include ::Refinery::ApplicationController
6
+ helper ApplicationHelper
7
+ helper Refinery::Core::Engine.helpers
8
+ include Refinery::Admin::BaseController
6
9
  include Pages::RenderOptions
7
10
 
8
- before_filter :find_page
11
+ skip_before_filter :error_404, :set_canonical
9
12
 
10
13
  layout :layout
11
14
 
@@ -262,6 +262,18 @@ module Refinery
262
262
  ::I18n.t('switch_to_website', :scope => 'refinery.site_bar')
263
263
  )
264
264
  end
265
+
266
+ it 'will show pages with inherited templates', :js do
267
+ visit refinery.admin_pages_path
268
+
269
+ find('a[tooltip^=Edit]').click
270
+ fill_in 'Title', :with => 'Searchable'
271
+ click_link 'Advanced options'
272
+ select 'Searchable', :from => 'View template'
273
+ click_button 'Preview'
274
+
275
+ new_window_should_have_content('Form application/search_form')
276
+ end
265
277
  end
266
278
 
267
279
  context 'a brand new page' do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refinerycms-pages
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.4
4
+ version: 2.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Philip Arndt
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-10-27 00:00:00.000000000 Z
13
+ date: 2014-11-07 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: friendly_id
@@ -74,14 +74,14 @@ dependencies:
74
74
  requirements:
75
75
  - - '='
76
76
  - !ruby/object:Gem::Version
77
- version: 2.1.4
77
+ version: 2.1.5
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
82
  - - '='
83
83
  - !ruby/object:Gem::Version
84
- version: 2.1.4
84
+ version: 2.1.5
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: babosa
87
87
  requirement: !ruby/object:Gem::Requirement