Merge branch 'master' into allow_all_data_attributes

refinery · May 26, 2016 · 36917c5 · 36917c5
2 parents cfa0b57 + 3941221
commit 36917c5
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 13 deletions.
diff --git a/...pport/shared contexts/admin_images_tab.rb → ...pport/shared_contexts/admin_images_tab.rb b/...pport/shared contexts/admin_images_tab.rb → ...pport/shared_contexts/admin_images_tab.rb
diff --git a/...ec/support/shared contexts/many_images.rb → ...ec/support/shared_contexts/many_images.rb b/...ec/support/shared contexts/many_images.rb → ...ec/support/shared_contexts/many_images.rb
diff --git a/...spec/support/shared contexts/no_images.rb → ...spec/support/shared_contexts/no_images.rb b/...spec/support/shared contexts/no_images.rb → ...spec/support/shared_contexts/no_images.rb
diff --git a/...spec/support/shared contexts/one_image.rb → ...spec/support/shared_contexts/one_image.rb b/...spec/support/shared contexts/one_image.rb → ...spec/support/shared_contexts/one_image.rb
diff --git a/...hared contexts/visual_editor_add_image.rb → ...hared_contexts/visual_editor_add_image.rb b/...hared contexts/visual_editor_add_image.rb → ...hared_contexts/visual_editor_add_image.rb
diff --git a/.../support/shared examples/image_deleter.rb → .../support/shared_examples/image_deleter.rb b/.../support/shared examples/image_deleter.rb → .../support/shared_examples/image_deleter.rb
diff --git a/...c/support/shared examples/image_editor.rb → ...c/support/shared_examples/image_editor.rb b/...c/support/shared examples/image_editor.rb → ...c/support/shared_examples/image_editor.rb
diff --git a/.../support/shared examples/image_indexer.rb → .../support/shared_examples/image_indexer.rb b/.../support/shared examples/image_indexer.rb → .../support/shared_examples/image_indexer.rb
diff --git a/...support/shared examples/image_inserter.rb → ...support/shared_examples/image_inserter.rb b/...support/shared examples/image_inserter.rb → ...support/shared_examples/image_inserter.rb
diff --git a/...upport/shared examples/image_previewer.rb → ...upport/shared_examples/image_previewer.rb b/...upport/shared examples/image_previewer.rb → ...upport/shared_examples/image_previewer.rb
diff --git a/...pport/shared examples/image_translator.rb → ...pport/shared_examples/image_translator.rb b/...pport/shared examples/image_translator.rb → ...pport/shared_examples/image_translator.rb
diff --git a/...support/shared examples/image_uploader.rb → ...support/shared_examples/image_uploader.rb b/...support/shared examples/image_uploader.rb → ...support/shared_examples/image_uploader.rb
diff --git a/pages/app/controllers/refinery/admin/pages_controller.rb b/pages/app/controllers/refinery/admin/pages_controller.rb
@@ -108,7 +108,7 @@ def save_and_continue_locals(page)
         nested_url = page.nested_url
         {
           new_refinery_edit_page_path: refinery.admin_edit_page_path(nested_url),
-          new_refinery_page_path: refinery.admin_page_path(nested_url),
+          new_refinery_page_path: refinery.admin_update_page_path(nested_url),
           new_page_path: refinery.pages_admin_preview_page_path(nested_url)
         }
       end

diff --git a/pages/spec/features/refinery/admin/pages_spec.rb b/pages/spec/features/refinery/admin/pages_spec.rb
@@ -193,16 +193,19 @@ module Admin
       end
 
       describe "edit/update" do
-        before do
-          Page.create :title => "Update me"
+        let(:updateable_page_parent) { Page.create title: "Parent page" }
+        let!(:updateable_page) {
+          updateable_page_parent.children.create title: "Update me"
+        }
 
+        before do
           visit refinery.admin_pages_path
           expect(page).to have_content("Update me")
         end
 
         context 'when saving and returning to index' do
-          it "updates page", js:true do
-            find('a[tooltip="Edit this page"]').trigger(:click)
+          it "updates page", js: true do
+            find("a[href$='#{updateable_page.slug}/edit']").trigger(:click)
 
             fill_in "Title", :with => "Updated"
             find("#submit_button").click
@@ -211,25 +214,33 @@ module Admin
           end
         end
 
-        context 'when saving and continuing to edit' do
+        context 'when saving and continuing to edit', js: true do
           before :each do
-            expect(page).to have_selector('a[tooltip^=Edit]', visible: true)
-            find('a[tooltip^=Edit]').click
+            expect(page).to have_selector("a[href$='#{updateable_page.slug}/edit']", visible: true)
+            find("a[href$='#{updateable_page.slug}/edit']").click
 
-            fill_in "Title", :with => "Updated"
+            fill_in "Title", :with => "Updated you"
             find("#submit_continue_button").click
             find('#flash').visible?
           end
 
-          it "updates page", js: true do
-            expect(page).to have_content("'Updated' was successfully updated.")
+          it "updates page" do
+            expect(page).to have_content("'Updated you' was successfully updated.")
+          end
+
+          # Regression test for https://github.com/refinery/refinerycms/issues/3179
+          # We expect this to end with /updated-you rather than /updated%2Fyou
+          it "doesn't have an encoded URL" do
+            updateable_page.reload # the slug will be different now
+            expect(page).not_to have_selector("form[action$='%2F#{updateable_page.slug}']")
+            expect(page).to have_selector("form[action$='/#{updateable_page.slug}']")
           end
 
           # Regression test for https://github.com/refinery/refinerycms/issues/1892
           context 'when saving to exit (a second time)' do
-            it 'updates page', js: true do
+            it 'updates page' do
               find("#submit_button").click
-              expect(page).to have_content("'Updated' was successfully updated.")
+              expect(page).to have_content("'Updated you' was successfully updated.")
             end
           end
         end