RubyGems - alchemy_cms - Versions diffs - 2.9.1 → 3.0.0.rc5 - Mend

alchemy_cms 2.9.1 → 3.0.0.rc5

Files changed (695) hide show

@@ -2,37 +2,57 @@
 <html>
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
-  <style type="text/css">
-    body {
-      background-color: #fff;
-      color: #666;
-      text-align: center;
-      font-family: arial, sans-serif;
-    }
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
-    h1 {
-      font-size: 100%;
-      color: #f00;
-      line-height: 1.5em;
-    }
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 <body>
-<!-- This file lives in public/404.html -->
-<div class="dialog">
-  <h1>The page you were looking for doesn't exist.</h1>
-  <p>You may have mistyped the address or the page may have moved.</p>
-</div>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
+  </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/spec/dummy/public/422.html CHANGED

@@ -2,37 +2,57 @@
 <html>
 <head>
   <title>The change you wanted was rejected (422)</title>
-  <style type="text/css">
-    body {
-      background-color: #fff;
-      color: #666;
-      text-align: center;
-      font-family: arial, sans-serif;
-    }
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
-    h1 {
-      font-size: 100%;
-      color: #f00;
-      line-height: 1.5em;
-    }
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 <body>
-<!-- This file lives in public/422.html -->
-<div class="dialog">
-  <h1>The change you wanted was rejected.</h1>
-  <p>Maybe you tried to change something you didn't have access to.</p>
-</div>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted was rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/spec/dummy/public/500.html CHANGED

@@ -2,37 +2,56 @@
 <html>
 <head>
   <title>We're sorry, but something went wrong (500)</title>
-  <style type="text/css">
-    body {
-      background-color: #fff;
-      color: #666;
-      text-align: center;
-      font-family: arial, sans-serif;
-    }
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
-    h1 {
-      font-size: 100%;
-      color: #f00;
-      line-height: 1.5em;
-    }
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 <body>
-<!-- This file lives in public/500.html -->
-<div class="dialog">
-  <h1>We're sorry, but something went wrong.</h1>
-  <p>We've been notified about this issue and we'll take a look at it shortly.</p>
-</div>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+  </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/spec/features/admin/language_tree_feature_spec.rb CHANGED

@@ -16,7 +16,7 @@ describe 'Language tree feature', js: true do
     it "one should be able to switch the language tree" do
       visit('/admin/pages')
-      page.select 'Klingonian', from: 'language_tree_select'
+      page.select 'Klingonian', from: 'language_id'
       page.should have_selector('#sitemap', text: 'Klingonian')
     end
   end
@@ -26,7 +26,7 @@ describe 'Language tree feature', js: true do
     it "it should display the form for creating language root" do
       visit('/admin/pages')
-      page.select 'Klingonian', from: 'language_tree_select'
+      page.select 'Klingonian', from: 'language_id'
       page.should have_content('This language tree does not exist')
     end
   end

data/spec/features/admin/modules_integration_spec.rb CHANGED

@@ -1,23 +1,18 @@
 require 'spec_helper'
 describe "Modules" do
   context "A custom module with a main-apps controller" do
-    before do
-      load_authorization_rules
-      authorize_as_admin
-    end
+    before { authorize_as_admin }
     it "should have a button in main_navigation, pointing to the configured controller" do
       Alchemy::Modules.register_module(
         {
-          :name => 'events',
-          :navigation => {
-            :icon => 'icon events',
-            :name => 'Events',
-            :controller => '/admin/events',
-            :action => 'index'
+          name: 'events',
+          navigation: {
+            icon: 'icon events',
+            name: 'Events',
+            controller: '/admin/events',
+            action: 'index'
           }
         })
       visit '/admin'
@@ -26,5 +21,4 @@ describe "Modules" do
     end
   end
 end

data/spec/features/admin/page_creation_feature_spec.rb ADDED

@@ -0,0 +1,50 @@
+require 'spec_helper'
+module Alchemy
+  describe "Page creation" do
+    before { authorize_as_admin }
+    describe "overlay GUI" do
+      context "without having a Page in the clipboard" do
+        it "does not contain tabs" do
+          visit new_admin_page_path
+          within('#main_content') { expect(page).to_not have_selector('#overlay_tabs') }
+        end
+      end
+      context "when having a Page in the clipboard" do
+        before { Page.stub all_from_clipboard_for_select: [build_stubbed(:page)] }
+        it "contains tabs for creating a new page and pasting from clipboard" do
+          visit new_admin_page_path
+          within('#overlay_tabs') { expect(page).to have_selector '#create_page_tab, #paste_page_tab' }
+        end
+        context "", js: true do
+          before do
+            visit admin_pages_path
+            page.first(:link, 'Create a new subpage').click
+          end
+          it "the create page tab is visible by default" do
+            within('#overlay_tabs') do
+              expect(find '#create_page_tab').to be_visible
+              expect(find '#paste_page_tab').to_not be_visible
+            end
+          end
+          context "when clicking on an inactive tab" do
+            it "shows that clicked tab" do
+              within('#overlay_tabs') do
+                click_link('Paste from clipboard')
+                expect(find '#create_page_tab').to_not be_visible
+                expect(find '#paste_page_tab').to be_visible
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/features/admin/page_editing_feature_spec.rb ADDED

@@ -0,0 +1,16 @@
+require 'spec_helper'
+describe 'Page editing feature', js: true do
+  let(:a_page) { FactoryGirl.create(:page) }
+  before { authorize_as_admin }
+  context "in preview mode" do
+    it "the menubar does not render on the page" do
+      visit alchemy.edit_admin_page_path(a_page)
+      within_frame('alchemy_preview_window') do
+        a_page.should_not have_selector('#alchemy_menubar')
+      end
+    end
+  end
+end

data/spec/features/admin/picture_library_integration_spec.rb CHANGED

@@ -1,6 +1,6 @@
 require 'spec_helper'
-describe "Picture Library", :js => true do
+describe "Picture Library", js: true do
   before do
     authorize_as_admin
@@ -9,8 +9,8 @@ describe "Picture Library", :js => true do
   describe "Tagging" do
     before do
-      picture = FactoryGirl.create(:picture, :tag_list => 'tag1', :name => 'TaggedWith1')
-      picture = FactoryGirl.create(:picture, :tag_list => 'tag2', :name => 'TaggedWith2')
+      picture = FactoryGirl.create(:picture, tag_list: 'tag1', name: 'TaggedWith1')
+      picture = FactoryGirl.create(:picture, tag_list: 'tag2', name: 'TaggedWith2')
     end
     it "it should be possible to filter tags by clicking on its name in the tag list" do
@@ -40,7 +40,7 @@ describe "Picture Library", :js => true do
   describe "Filter by tag" do
     before do
-      FactoryGirl.create(:picture, :tag_list => 'bla')
+      FactoryGirl.create(:picture, tag_list: 'bla')
     end
     it "should list all applied tags" do

data/spec/features/admin/resources_integration_spec.rb CHANGED

@@ -1,14 +1,10 @@
 require 'spec_helper'
 describe "Resources" do
   let(:event)        { FactoryGirl.create(:event) }
   let(:second_event) { FactoryGirl.create(:event, :name => 'My second Event', :entrance_fee => 12.32) }
-  before do
-    load_authorization_rules
-    authorize_as_admin
-  end
+  before { authorize_as_admin }
   describe "index view" do
@@ -42,6 +38,13 @@ describe "Resources" do
       page.should have_selector('textarea#event_description')
       page.should have_selector('input#event_published[type="checkbox"]')
     end
+    it "should have a select box for associated models" do
+      visit '/admin/events/new'
+      within('form') do
+        page.should have_selector('select')
+      end
+    end
   end
   describe "create resource item" do
@@ -76,9 +79,7 @@ describe "Resources" do
       end
       it "lists invalid fields" do
-        within('#errors') {
-          page.should have_content("Name can't be blank")
-        }
+        page.should have_content("can't be blank")
       end
       it "should not display success notice" do
@@ -104,7 +105,7 @@ describe "Resources" do
     end
   end
-  describe "destroying an item", :js => true do
+  describe "destroying an item" do
     before do
       event
       second_event
@@ -112,10 +113,9 @@ describe "Resources" do
       within('tr', :text => 'My second Event') do
         click_on 'Delete'
       end
-      click_on 'Yes'
     end
-    it "should'n be on the list anymore" do
+    it "shouldn't be on the list anymore" do
       page.should have_content "My Event"
       page.should_not have_content "My second Event"
     end