alchemy_cms 3.0.4 → 3.1.0.beta1

data/spec/tasks/helpers_spec.rb

@@ -21,8 +21,8 @@ module Alchemy
     end
 
     before do
-      File.stub(exists?: true)
-      YAML.stub(load_file: config)
+      allow(File).to receive(:exists?).and_return( true)
+      allow(YAML).to receive(:load_file).and_return(config)
     end
 
     describe "#database_dump_command" do
@@ -31,7 +31,7 @@ module Alchemy
       context "when config for RAILS_ENV not found" do
         let(:adapter) { 'mysql2' }
 
-        before { Foo.stub(environment: 'huh?') }
+        before { allow(Foo).to receive(:environment).and_return('huh?') }
 
         it "should raise an error" do
           expect { subject }.to raise_error(RuntimeError)
@@ -50,27 +50,27 @@ module Alchemy
         let(:adapter) { 'mysql2' }
 
         it "uses the mysqldump command" do
-          should include('mysqldump ')
+          is_expected.to include('mysqldump ')
         end
 
         context "when a username is set in the config file" do
-          it { should include("--user='testuser'") }
+          it { is_expected.to include("--user='testuser'") }
         end
 
         context "when a password is set in the config file" do
-          it { should include("--password='123456'") }
+          it { is_expected.to include("--password='123456'") }
         end
 
         context "when a host is set in the config file" do
           context "and the host is localhost" do
-            it { should_not include("--host=") }
+            it { is_expected.not_to include("--host=") }
           end
 
           context "and the host is anything but not localhost" do
             before do
-              YAML.stub(load_file: {'test' => {'host' => 'mydomain.com'}})
+              allow(YAML).to receive(:load_file).and_return({'test' => {'host' => 'mydomain.com'}})
             end
-            it { should include("--host='mydomain.com'") }
+            it { is_expected.to include("--host='mydomain.com'") }
           end
         end
       end
@@ -79,27 +79,27 @@ module Alchemy
         let(:adapter) { 'postgresql' }
 
         it "uses the pg_dump command with clean option" do
-          should include('pg_dump --clean')
+          is_expected.to include('pg_dump --clean')
         end
 
         context "when a username is set in the config file" do
-          it { should include("--username='testuser'") }
+          it { is_expected.to include("--username='testuser'") }
         end
 
         context "when a password is set in the config file" do
-          it { should include("PGPASSWORD='123456'") }
+          it { is_expected.to include("PGPASSWORD='123456'") }
         end
 
         context "when a host is set in the config file" do
           context "and the host is localhost" do
-            it { should_not include("--host=") }
+            it { is_expected.not_to include("--host=") }
           end
 
           context "and the host is anything but not localhost" do
             before do
-              YAML.stub(load_file: {'test' => {'host' => 'mydomain.com'}})
+              allow(YAML).to receive(:load_file).and_return({'test' => {'host' => 'mydomain.com'}})
             end
-            it { should include("--host='mydomain.com'") }
+            it { is_expected.to include("--host='mydomain.com'") }
           end
         end
       end
@@ -115,7 +115,7 @@ module Alchemy
       context "when config for RAILS_ENV not found" do
         let(:adapter) { 'mysql' }
 
-        before { Foo.stub(environment: 'huh?') }
+        before { allow(Foo).to receive(:environment).and_return('huh?') }
 
         it "should raise an error" do
           expect { subject }.to raise_error(RuntimeError)
@@ -134,27 +134,27 @@ module Alchemy
         let(:adapter) { 'mysql' }
 
         it "uses the mysql command" do
-          should include('mysql ')
+          is_expected.to include('mysql ')
         end
 
         context "when a username is set in the config file" do
-          it { should include("--user='testuser'") }
+          it { is_expected.to include("--user='testuser'") }
         end
 
         context "when a password is set in the config file" do
-          it { should include("--password='123456'") }
+          it { is_expected.to include("--password='123456'") }
         end
 
         context "when a host is set in the config file" do
           context "and the host is localhost" do
-            it { should_not include("--host=") }
+            it { is_expected.not_to include("--host=") }
           end
 
           context "and the host is anything but not localhost" do
             before do
-              YAML.stub(load_file: {'test' => {'host' => 'mydomain.com'}})
+              allow(YAML).to receive(:load_file).and_return({'test' => {'host' => 'mydomain.com'}})
             end
-            it { should include("--host='mydomain.com'") }
+            it { is_expected.to include("--host='mydomain.com'") }
           end
         end
       end
@@ -163,27 +163,27 @@ module Alchemy
         let(:adapter) { 'postgresql' }
 
         it "uses the psql command" do
-          should include('psql ')
+          is_expected.to include('psql ')
         end
 
         context "when a username is set in the config file" do
-          it { should include("--username='testuser'") }
+          it { is_expected.to include("--username='testuser'") }
         end
 
         context "when a password is set in the config file" do
-          it { should include("PGPASSWORD='123456'") }
+          it { is_expected.to include("PGPASSWORD='123456'") }
         end
 
         context "when a host is set in the config file" do
           context "and the host is localhost" do
-            it { should_not include("--host=") }
+            it { is_expected.not_to include("--host=") }
           end
 
           context "and the host is anything but not localhost" do
             before do
-              YAML.stub(load_file: {'test' => {'host' => 'mydomain.com'}})
+              allow(YAML).to receive(:load_file).and_return({'test' => {'host' => 'mydomain.com'}})
             end
-            it { should include("--host='mydomain.com'") }
+            it { is_expected.to include("--host='mydomain.com'") }
           end
         end
       end
@@ -201,7 +201,7 @@ module Alchemy
       end
 
       context 'for missing database config file' do
-        before { File.stub(exists?: false) }
+        before { allow(File).to receive(:exists?).and_return( false) }
 
         it "raises error" do
           expect { Foo.database_config }.to raise_error(RuntimeError)

data/spec/views/essences/essence_boolean_editor_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'alchemy/essences/_essence_boolean_editor' do
+  let(:essence) { Alchemy::EssenceBoolean.new(ingredient: false) }
+  let(:content) { Alchemy::Content.new(essence: essence, name: 'Boolean') }
+
+  before do
+    allow(view).to receive(:render_content_name).and_return(content.name)
+    allow(view).to receive(:delete_content_link).and_return('')
+  end
+
+  it "renders a checkbox" do
+    render partial: "alchemy/essences/essence_boolean_editor", locals: {content: content}
+    expect(rendered).to have_selector('input[type="checkbox"]')
+  end
+
+  context 'with default value given in view local options' do
+    it "checks the checkbox" do
+      render partial: "alchemy/essences/essence_boolean_editor", locals: {content: content, options: {default_value: true}}
+      expect(rendered).to have_selector('input[type="checkbox"][checked="checked"]')
+    end
+  end
+
+  context 'with default value given in content settings' do
+    before { allow(content).to receive(:settings).and_return({default_value: true}) }
+
+    it "checks the checkbox" do
+      render partial: "alchemy/essences/essence_boolean_editor", locals: {content: content}
+      expect(rendered).to have_selector('input[type="checkbox"][checked="checked"]')
+    end
+  end
+end

data/spec/views/essences/essence_boolean_view_spec.rb

@@ -4,7 +4,7 @@ describe 'alchemy/essences/_essence_boolean_view' do
 
   context 'with true as ingredient' do
     let(:content) { Alchemy::EssenceBoolean.new(ingredient: true) }
-    before { view.stub(:_t).and_return('true') }
+    before { allow(view).to receive(:_t).and_return('true') }
 
     it "renders true" do
       render content, content: content
@@ -14,7 +14,7 @@ describe 'alchemy/essences/_essence_boolean_view' do
 
   context 'with false as ingredient' do
     let(:content) { Alchemy::EssenceBoolean.new(ingredient: false) }
-    before { view.stub(:_t).and_return('false') }
+    before { allow(view).to receive(:_t).and_return('false') }
 
     it "renders false" do
       render content, content: content

data/spec/views/essences/essence_date_view_spec.rb

@@ -6,7 +6,7 @@ describe 'alchemy/essences/_essence_date_view' do
   let(:options) { {} }
 
   before do
-    view.stub(:options).and_return(options)
+    allow(view).to receive(:options).and_return(options)
   end
 
   context "with date value" do

data/spec/views/essences/essence_link_view_spec.rb

@@ -27,4 +27,15 @@ describe 'alchemy/essences/_essence_link_view' do
       expect(rendered).to eq('<a href="http://google.com">Google</a>')
     end
   end
+
+  context 'with text setting on content description' do
+    before do
+      allow(content).to receive(:settings).and_return({text: 'Yahoo'})
+    end
+
+    it "renders a link" do
+      render content.essence, content: content, options: options, html_options: {}
+      expect(rendered).to eq('<a href="http://google.com">Yahoo</a>')
+    end
+  end
 end

data/spec/views/essences/essence_picture_view_spec.rb

@@ -8,11 +8,11 @@ describe "essences/_essence_picture_view" do
   before do
     ActionView::Base.send(:include, Alchemy::UrlHelper)
     ActionView::Base.send(:include, Alchemy::EssencesHelper)
-    view.stub(:configuration).and_return(:jpg)
+    allow(view).to receive(:configuration).and_return(:jpg)
   end
 
   context "with caption" do
-    let(:options) { {show_caption: true} }
+    let(:options) { {} }
     let(:html_options) { {} }
 
     subject do
@@ -24,18 +24,64 @@ describe "essences/_essence_picture_view" do
     end
 
     it "should enclose the image in a <figure> element" do
-      should have_selector('figure img')
+      is_expected.to have_selector('figure img')
+    end
+
+    it "should shows the caption" do
+      should have_selector('figure figcaption')
+      should have_content('This is a cute cat')
+    end
+
+    context "but disabled in the options" do
+      let(:options) { {show_caption: false} }
+
+      it "should not enclose the image in a <figure> element" do
+        should_not have_selector('figure img')
+      end
+
+      it "should not show the caption" do
+        should_not have_selector('figure figcaption')
+        should_not have_content('This is a cute cat')
+      end
+    end
+
+    context "but disabled in the content settings" do
+      before do
+        allow(content).to receive(:settings).and_return({show_caption: false})
+      end
+
+      it "should not enclose the image in a <figure> element" do
+        should_not have_selector('figure img')
+      end
+
+      it "should not show the caption" do
+        should_not have_selector('figure figcaption')
+        should_not have_content('This is a cute cat')
+      end
+
+      context 'but enabled in the options hash' do
+        let(:options) { {show_caption: true} }
+
+        it "should enclose the image in a <figure> element" do
+          should have_selector('figure img')
+        end
+
+        it "should shows the caption" do
+          should have_selector('figure figcaption')
+          should have_content('This is a cute cat')
+        end
+      end
     end
 
     context "and essence with css class" do
       before { essence_picture.css_class = 'left' }
 
       it "should have the class on the <figure> element" do
-        should have_selector('figure.left img')
+        is_expected.to have_selector('figure.left img')
       end
 
       it "should not have the class on the <img> element" do
-        should_not have_selector('figure img.left')
+        is_expected.not_to have_selector('figure img.left')
       end
     end
 
@@ -43,15 +89,15 @@ describe "essences/_essence_picture_view" do
       before { html_options[:class] = 'right' }
 
       it "should have the class from the html_options on the <figure> element" do
-        should have_selector('figure.right img')
+        is_expected.to have_selector('figure.right img')
       end
 
       it "should not have the class from the essence on the <figure> element" do
-        should_not have_selector('figure.left img')
+        is_expected.not_to have_selector('figure.left img')
       end
 
       it "should not have the class from the html_options on the <img> element" do
-        should_not have_selector('figure img.right')
+        is_expected.not_to have_selector('figure img.right')
       end
     end
   end
@@ -69,16 +115,15 @@ describe "essences/_essence_picture_view" do
     end
 
     it "should enclose the image in a link tag" do
-      should have_selector('a[href="/home"] img')
+      is_expected.to have_selector('a[href="/home"] img')
     end
 
     context "but disabled link option" do
       before { options[:disable_link] = true }
 
       it "should not enclose the image in a link tag" do
-        should_not have_selector('a img')
+        is_expected.not_to have_selector('a img')
       end
     end
   end
-
 end

data/spec/views/essences/essence_richtext_view_spec.rb

@@ -17,4 +17,16 @@ describe 'alchemy/essences/_essence_richtext_view' do
       expect(rendered).to_not have_selector('h1')
     end
   end
+
+  context 'with content.settings[:plain_text] true' do
+    before do
+      allow(content).to receive(:settings).and_return({plain_text: true})
+    end
+
+    it "renders the text body" do
+      render content.essence, content: content
+      expect(rendered).to have_content('Lorem ipsum dolor sit amet consectetur adipiscing elit.')
+      expect(rendered).to_not have_selector('h1')
+    end
+  end
 end

data/spec/views/essences/essence_text_view_spec.rb

@@ -35,6 +35,18 @@ describe 'alchemy/essences/_essence_text_view' do
         expect(rendered).to_not have_selector('a')
       end
     end
+
+    context 'but with content settings disable_link set to true' do
+      before do
+        allow(content).to receive(:settings).and_return({disable_link: true})
+      end
+
+      it "only renders the ingredient" do
+        render content.essence, content: content
+        expect(rendered).to have_content('Hello World')
+        expect(rendered).to_not have_selector('a')
+      end
+    end
   end
 
 end

data/vendor/assets/javascripts/tinymce/langs/de.js

@@ -1,8 +1,11 @@
 tinymce.addI18n('de',{
 "Cut": "Ausschneiden",
+"Heading 5": "\u00dcberschrift 5",
 "Header 2": "\u00dcberschrift 2",
 "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Ihr Browser unterst\u00fctzt leider keinen direkten Zugriff auf die Zwischenablage. Bitte benutzen Sie die Strg + X \/ C \/ V Tastenkombinationen.",
+"Heading 4": "\u00dcberschrift 4",
 "Div": "Textblock",
+"Heading 2": "\u00dcberschrift 2",
 "Paste": "Einf\u00fcgen",
 "Close": "Schlie\u00dfen",
 "Font Family": "Schriftart",
@@ -11,6 +14,8 @@ tinymce.addI18n('de',{
 "New document": "Neues Dokument",
 "Blockquote": "Zitat",
 "Numbered list": "Nummerierte Liste",
+"Heading 1": "\u00dcberschrift 1",
+"Headings": "\u00dcberschriften",
 "Increase indent": "Einzug vergr\u00f6\u00dfern",
 "Formats": "Formate",
 "Headers": "\u00dcberschriften",
@@ -34,6 +39,8 @@ tinymce.addI18n('de',{
 "Italic": "Kursiv",
 "Align center": "Zentriert ausrichten",
 "Header 5": "\u00dcberschrift 5",
+"Heading 6": "\u00dcberschrift 6",
+"Heading 3": "\u00dcberschrift 3",
 "Decrease indent": "Einzug verkleinern",
 "Header 4": "\u00dcberschrift 4",
 "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Einf\u00fcgen ist nun im einfachen Textmodus. Inhalte werden ab jetzt als unformatierter Text eingef\u00fcgt, bis Sie diese Einstellung wieder ausschalten!",
@@ -59,6 +66,7 @@ tinymce.addI18n('de',{
 "Restore last draft": "Letzten Entwurf wiederherstellen",
 "Special character": "Sonderzeichen",
 "Source code": "Quelltext",
+"Color": "Farbe",
 "Right to left": "Von rechts nach links",
 "Left to right": "Von links nach rechts",
 "Emoticons": "Emoticons",
@@ -121,11 +129,13 @@ tinymce.addI18n('de',{
 "Finish": "Ende",
 "Ignore all": "Alles Ignorieren",
 "Ignore": "Ignorieren",
+"Add to Dictionary": "Zum W\u00f6rterbuch hinzuf\u00fcgen",
 "Insert row before": "Neue Zeile davor einf\u00fcgen ",
 "Rows": "Zeilen",
 "Height": "H\u00f6he",
 "Paste row after": "Zeile danach einf\u00fcgen",
 "Alignment": "Ausrichtung",
+"Border color": "Rahmenfarbe",
 "Column group": "Spaltengruppe",
 "Row": "Zeile",
 "Insert column before": "Neue Spalte davor einf\u00fcgen",
@@ -141,15 +151,20 @@ tinymce.addI18n('de',{
 "Paste row before": "Zeile davor einf\u00fcgen",
 "Scope": "G\u00fcltigkeitsbereich",
 "Delete table": "Tabelle l\u00f6schen",
+"H Align": "Horizontale Ausrichtung",
+"Top": "Oben",
 "Header cell": "Kopfzelle",
 "Column": "Spalte",
+"Row group": "Zeilengruppe",
 "Cell": "Zelle",
-"Header": "Kopfzeile",
+"Middle": "Mitte",
 "Cell type": "Zellentyp",
 "Copy row": "Zeile kopieren",
 "Row properties": "Zeileneigenschaften",
 "Table properties": "Tabelleneigenschaften",
-"Row group": "Zeilengruppe",
+"Bottom": "Unten",
+"V Align": "Vertikale Ausrichtung",
+"Header": "Kopfzeile",
 "Right": "Rechtsb\u00fcndig",
 "Insert column after": "Neue Spalte danach einf\u00fcgen",
 "Cols": "Spalten",
@@ -164,6 +179,9 @@ tinymce.addI18n('de',{
 "Insert template": "Vorlage einf\u00fcgen ",
 "Templates": "Vorlagen",
 "Background color": "Hintergrundfarbe",
+"Custom...": "Benutzerdefiniert...",
+"Custom color": "Benutzerdefinierte Farbe",
+"No color": "Keine Farbe",
 "Text color": "Textfarbe",
 "Show blocks": " Bl\u00f6cke anzeigen",
 "Show invisible characters": "Unsichtbare Zeichen anzeigen",