refinerycms-inquiries 2.1.0 → 3.0.0

data/spec/features/refinery/inquiries/inquiries_spec.rb

@@ -2,12 +2,17 @@ require "spec_helper"
 
 module Refinery
   module Inquiries
-    describe "inquiries" do
-      before(:each) do
+    describe "inquiries", :type => :feature do
+      before do
         # load in seeds we use in migration
         Refinery::Inquiries::Engine.load_seed
       end
 
+      it "posts to the correct URL" do
+        visit refinery.inquiries_new_inquiry_path
+        expect(page).to have_selector("form[action='#{refinery.inquiries_inquiries_path}']")
+      end
+
       context "when valid data" do
         it "is successful" do
           visit refinery.inquiries_new_inquiry_path
@@ -17,16 +22,16 @@ module Refinery
           fill_in "Message", :with => "Hey, I'm testing!"
           click_button "Send message"
 
-          page.current_path.should == refinery.thank_you_inquiries_inquiries_path
-          page.should have_content("Thank You")
+          expect(page.current_path).to eq(refinery.thank_you_inquiries_inquiries_path)
+          expect(page).to have_content("Thank You")
 
           within "#body_content" do
-            page.should have_content("We've received your inquiry and will get back to you with a response shortly.")
-            page.should have_content("Return to the home page")
-            page.should have_selector("a[href='/']")
+            expect(page).to have_content("We've received your inquiry and will get back to you with a response shortly.")
+            expect(page).to have_content("Return to the home page")
+            expect(page).to have_selector("a[href='/']")
           end
 
-          Refinery::Inquiries::Inquiry.count.should == 1
+          expect(Refinery::Inquiries::Inquiry.count).to eq(1)
         end
       end
 
@@ -40,14 +45,14 @@ module Refinery
 
           click_button "Send message"
 
-          page.current_path.should == refinery.inquiries_new_inquiry_path
-          page.should have_content("There were problems with the following fields")
-          page.should have_content(name_error_message)
-          page.should have_content(email_error_message)
-          page.should have_content(message_error_message)
-          page.should have_no_content("Phone can't be blank")
+          expect(page.current_path).to eq(refinery.inquiries_inquiries_path)
+          expect(page).to have_content("There were problems with the following fields")
+          expect(page).to have_content(name_error_message)
+          expect(page).to have_content(email_error_message)
+          expect(page).to have_content(message_error_message)
+          expect(page).to have_no_content("Phone can't be blank")
 
-          Refinery::Inquiries::Inquiry.count.should == 0
+          expect(Refinery::Inquiries::Inquiry.count).to eq(0)
         end
 
         it "displays the error messages in the same order as the fields" do
@@ -55,34 +60,34 @@ module Refinery
 
           click_button "Send message"
 
-          page.should have_content(/#{name_error_message}.+#{email_error_message}.+#{message_error_message}/m)
+          expect(page).to have_content(/#{name_error_message}.+#{email_error_message}.+#{message_error_message}/m)
         end
       end
 
       describe "privacy" do
         context "when show contact privacy link setting set to false" do
           before(:each) do
-            Refinery::Inquiries.config.stub(:show_contact_privacy_link).and_return(false)
+            allow(Refinery::Inquiries.config).to receive(:show_contact_privacy_link).and_return(false)
           end
 
           it "won't show link" do
             visit refinery.inquiries_new_inquiry_path
 
-            page.should have_no_content("We value your privacy")
-            page.should have_no_selector("a[href='/pages/privacy-policy']")
+            expect(page).to have_no_content("We value your privacy")
+            expect(page).to have_no_selector("a[href='/pages/privacy-policy']")
           end
         end
 
         context "when show contact privacy link setting set to true" do
           before(:each) do
-            Refinery::Inquiries.config.stub(:show_contact_privacy_link).and_return(true)
+            allow(Refinery::Inquiries.config).to receive(:show_contact_privacy_link).and_return(true)
           end
 
           it "shows the link" do
             visit refinery.inquiries_new_inquiry_path
 
-            page.should have_content("We value your privacy")
-            page.should have_selector("a[href='/pages/privacy-policy']")
+            expect(page).to have_content("We value your privacy")
+            expect(page).to have_selector("a[href='/pages/privacy-policy']")
           end
         end
       end
@@ -90,25 +95,25 @@ module Refinery
       describe "palceholders" do
         context "when show placeholders setting set to false" do
           before(:each) do
-            Refinery::Inquiries.config.stub(:show_placeholders).and_return(false)
+            allow(Refinery::Inquiries.config).to receive(:show_placeholders).and_return(false)
           end
 
           it "won't show placeholders" do
             visit refinery.inquiries_new_inquiry_path
 
-            page.should have_no_selector("input[placeholder]")
+            expect(page).to have_no_selector("input[placeholder]")
           end
         end
 
         context "when show placeholders setting set to true" do
           before(:each) do
-            Refinery::Inquiries.config.stub(:show_placeholders).and_return(true)
+            allow(Refinery::Inquiries.config).to receive(:show_placeholders).and_return(true)
           end
 
           it "shows the placeholders" do
             visit refinery.inquiries_new_inquiry_path
 
-            page.should have_selector("input[placeholder]")
+            expect(page).to have_selector("input[placeholder]")
           end
         end
       end
@@ -116,27 +121,27 @@ module Refinery
       describe "phone number" do
         context "when show phone numbers setting set to false" do
           before(:each) do
-            Refinery::Inquiries.config.stub(:show_phone_number_field).and_return(false)
+            allow(Refinery::Inquiries.config).to receive(:show_phone_number_field).and_return(false)
           end
 
           it "won't show phone number" do
             visit refinery.inquiries_new_inquiry_path
 
-            page.should have_no_selector("label", :text => 'Phone')
-            page.should have_no_selector("#inquiry_phone")
+            expect(page).to have_no_selector("label", :text => 'Phone')
+            expect(page).to have_no_selector("#inquiry_phone")
           end
         end
 
         context "when show phone numbers setting set to true" do
           before(:each) do
-            Refinery::Inquiries.config.stub(:show_phone_number_field).and_return(true)
+            allow(Refinery::Inquiries.config).to receive(:show_phone_number_field).and_return(true)
           end
 
           it "shows the phone number" do
             visit refinery.inquiries_new_inquiry_path
 
-            page.should have_selector("label", :text => 'Phone')
-            page.should have_selector("#inquiry_phone")
+            expect(page).to have_selector("label", :text => 'Phone')
+            expect(page).to have_selector("#inquiry_phone")
           end
         end
       end

data/spec/features/refinery/inquiries/mailer_spec.rb

@@ -3,38 +3,39 @@ require "capybara/email/rspec"
 
 module Refinery
   module Inquiries
-    describe "mailer" do
+    describe "mailer", :type => :feature do
       before do
-        FactoryGirl.create(:page, :link_url => "/contact")
+        FactoryGirl.create(:page, :link_url => Refinery::Inquiries.page_path_new)
 
-        Refinery::Inquiries::Setting.stub(:notification_recipients).and_return("rspec@refinerycms.com")
+        allow(Refinery::Inquiries::Setting).to receive(:notification_recipients)
+          .and_return("rspec@refinerycms.com")
 
         clear_emails
 
         visit refinery.inquiries_new_inquiry_path
 
-        fill_in "Name", :with => "Ugis Ozols"
-        fill_in "Email", :with => "ugis.ozols@refinerycms.com"
-        fill_in "Message", :with => "Hey, I'm testing!"
+        fill_in "Name", with: "Ugis Ozols"
+        fill_in "Email", with: "ugis.ozols@refinerycms.com"
+        fill_in "Message", with: "Hey, I'm testing!"
         click_button "Send message"
       end
 
       it "sends confirmation email" do
         open_email("ugis.ozols@refinerycms.com")
 
-        current_email.from.should eq("Ugis Ozols [#{Refinery::Core.site_name}] <#{Refinery::Inquiries.from_name}@example.com>")
-        current_email.to.should eq(["ugis.ozols@refinerycms.com"])
-        current_email.subject.should eq("Thank you for your inquiry")
-        current_email.body.should eq("Thank you for your inquiry Ugis Ozols,\n\nThis email is a receipt to confirm we have received your inquiry and we'll be in touch shortly.\n\nThanks.")
+        expect(current_email.from).to eq(["#{Refinery::Inquiries.from_name}@example.com"])
+        expect(current_email.to).to eq(["ugis.ozols@refinerycms.com"])
+        expect(current_email.subject).to eq("Thank you for your inquiry")
+        expect(current_email.body).to eq("Thank you for your inquiry Ugis Ozols,\n\nThis email is a receipt to confirm we have received your inquiry and we'll be in touch shortly.\n\nThanks.")
       end
 
       it "sends notification email" do
         open_email("rspec@refinerycms.com")
 
-        current_email.from.should eq("Ugis Ozols [#{Refinery::Core.site_name}] <#{Refinery::Inquiries.from_name}@example.com>")
-        current_email.to.should eq(["rspec@refinerycms.com"])
-        current_email.subject.should eq("New inquiry from your website")
-        current_email.body.should eq("Hi there,\n\nYou just received a new inquiry on your website.\n\n--- inquiry starts ---\n\nFrom: Ugis Ozols\nEmail: ugis.ozols@refinerycms.com\nPhone: \nMessage:\nHey, I'm testing!\n\n--- inquiry ends ---\n\nKind Regards,\nCompany Name\n\nP.S. All your inquiries are stored in the \"Inquiries\" section of Refinery should you ever want to view it later there.")
+        expect(current_email.from).to eq(["#{Refinery::Inquiries.from_name}@example.com"])
+        expect(current_email.to).to eq(["rspec@refinerycms.com"])
+        expect(current_email.subject).to eq("New inquiry from your website")
+        expect(current_email.body).to eq("Hi there,\n\nYou just received a new inquiry on your website.\n\n--- inquiry starts ---\n\nFrom: Ugis Ozols\nEmail: ugis.ozols@refinerycms.com\nPhone: \nMessage:\nHey, I'm testing!\n\n--- inquiry ends ---\n\nKind Regards,\nCompany Name\n\nP.S. All your inquiries are stored in the \"Inquiries\" section of Refinery should you ever want to view it later there.")
       end
     end
   end

data/spec/models/refinery/inquiries/inquiry_spec.rb

@@ -2,48 +2,90 @@ require 'spec_helper'
 
 module Refinery
   module Inquiries
-    describe Inquiry do
+    describe Inquiry, :type => :model do
       describe "validations" do
         subject do
-          FactoryGirl.build(:inquiry,
-                            :name => "Ugis Ozols",
-                            :email => "ugis.ozols@refinerycms.com",
-                            :message => "Hey, I'm testing!")
+          FactoryGirl.build(:inquiry, {
+            name: "Ugis Ozols",
+            email: "ugis.ozols@example.com",
+            message: "Hey, I'm testing!"
+          })
         end
 
-        it { should be_valid }
-        its(:errors) { should be_empty }
-        its(:name) { should == "Ugis Ozols" }
-        its(:email) { should == "ugis.ozols@refinerycms.com" }
-        its(:message) { should == "Hey, I'm testing!" }
+        it { is_expected.to be_valid }
+
+        describe '#errors' do
+          subject { super().errors }
+          it { is_expected.to be_empty }
+        end
+
+        describe '#name' do
+          subject { super().name }
+          it { is_expected.to eq("Ugis Ozols") }
+        end
+
+        describe '#email' do
+          subject { super().email }
+          it { is_expected.to eq("ugis.ozols@example.com") }
+        end
+
+        describe '#message' do
+          subject { super().message }
+          it { is_expected.to eq("Hey, I'm testing!") }
+        end
+
+        it "validates name length" do
+          expect(FactoryGirl.build(:inquiry, {
+            name: "a"*255,
+            email: "ugis.ozols@example.com",
+            message: "This Text Is OK"
+          })).to be_valid
+          expect(FactoryGirl.build(:inquiry, {
+            name: "a"*256,
+            email: "ugis.ozols@example.com",
+            message: "This Text Is OK"
+          })).not_to be_valid
+        end
+        it "validates email length" do
+          expect(FactoryGirl.build(:inquiry, {
+            name: "Ugis Ozols",
+            email: "a"*243 + "@example.com",
+            message: "This Text Is OK"
+          })).to be_valid
+          expect(FactoryGirl.build(:inquiry, {
+            name: "Ugis Ozols",
+            email: "a"*244 + "@example.com",
+            message: "This Text Is OK"
+          })).not_to be_valid
+        end
       end
 
       describe "default scope" do
         it "orders by created_at in desc" do
-          inquiry1 = FactoryGirl.create(:inquiry, :created_at => 1.hour.ago)
-          inquiry2 = FactoryGirl.create(:inquiry, :created_at => 2.hours.ago)
-          inquiries = Refinery::Inquiries::Inquiry.all
-          inquiries.first.should == inquiry1
-          inquiries.second.should == inquiry2
+          inquiry1 = FactoryGirl.create(:inquiry, created_at: 1.hour.ago)
+          inquiry2 = FactoryGirl.create(:inquiry, created_at: 2.hours.ago)
+          inquiries = Inquiry.all
+          expect(inquiries.first).to eq(inquiry1)
+          expect(inquiries.second).to eq(inquiry2)
         end
       end
 
       describe ".latest" do
         it "returns latest 7 non-spam inquiries by default" do
           8.times { FactoryGirl.create(:inquiry) }
-          Refinery::Inquiries::Inquiry.last.toggle!(:spam)
-          Refinery::Inquiries::Inquiry.latest.length.should == 7
+          Inquiry.last.toggle!(:spam)
+          expect(Inquiry.latest.length).to eq(7)
         end
 
         it "returns latest 7 inquiries including spam ones" do
           7.times { FactoryGirl.create(:inquiry) }
-          Refinery::Inquiries::Inquiry.all[0..2].each { |inquiry| inquiry.toggle!(:spam) }
-          Refinery::Inquiries::Inquiry.latest(7, true).length.should == 7
+          Inquiry.all[0..2].each { |inquiry| inquiry.toggle!(:spam) }
+          expect(Inquiry.latest(7, true).length).to eq(7)
         end
 
         it "returns latest n inquiries" do
           4.times { FactoryGirl.create(:inquiry) }
-          Refinery::Inquiries::Inquiry.latest(3).length.should == 3
+          expect(Inquiry.latest(3).length).to eq(3)
         end
       end
     end

data/spec/models/refinery/inquiries/setting_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module Refinery
+  module Inquiries
+    describe Setting, :type => :model do
+      describe ".notification_recipients=" do
+        it "delegates to Refinery::Setting#set" do
+          expect(Refinery::Setting).to receive(:set).
+            with(:inquiry_notification_recipients, {
+              :value=>"some value",
+              :scoping=>"inquiries"
+            })
+
+          Refinery::Inquiries::Setting.notification_recipients = "some value"
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,14 +7,14 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 
 require 'rspec/rails'
 require 'capybara/rspec'
-require 'factory_girl_rails'
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
 
 Rails.backtrace_cleaner.remove_silencers!
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-inquiries
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Uģis Ozols
@@ -10,50 +10,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: filters_spam
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.4
 description: Inquiry handling functionality extracted from Refinery CMS to allow you
   to have a contact form and manage inquiries in the Refinery backend.
 email: info@refinerycms.com
@@ -61,8 +75,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Rakefile
 - app/assets/stylesheets/refinery/inquiries/inquiries.css.scss
@@ -80,10 +94,15 @@ files:
 - app/views/refinery/inquiries/admin/settings/_confirmation_email_form.html.erb
 - app/views/refinery/inquiries/admin/settings/_notification_recipients_form.html.erb
 - app/views/refinery/inquiries/admin/settings/edit.html.erb
+- app/views/refinery/inquiries/inquiries/_form.html.erb
 - app/views/refinery/inquiries/inquiries/new.html.erb
 - app/views/refinery/inquiries/inquiries/thank_you.html.erb
 - app/views/refinery/inquiries/inquiry_mailer/confirmation.text.erb
 - app/views/refinery/inquiries/inquiry_mailer/notification.text.erb
+- bin/rails
+- bin/rake
+- bin/rspec
+- bin/spring
 - config/locales/bg.yml
 - config/locales/cs.yml
 - config/locales/da.yml
@@ -104,6 +123,7 @@ files:
 - config/locales/sl.yml
 - config/locales/sv.yml
 - config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - config/routes.rb
 - db/migrate/20101208082840_create_inquiries.rb
 - db/seeds.rb
@@ -121,6 +141,7 @@ files:
 - spec/features/refinery/inquiries/inquiries_spec.rb
 - spec/features/refinery/inquiries/mailer_spec.rb
 - spec/models/refinery/inquiries/inquiry_spec.rb
+- spec/models/refinery/inquiries/setting_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 homepage: http://refinerycms.com
@@ -133,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Inquiry handling functionality for the Refinery CMS project.
@@ -153,5 +174,5 @@ test_files:
 - spec/features/refinery/inquiries/inquiries_spec.rb
 - spec/features/refinery/inquiries/mailer_spec.rb
 - spec/models/refinery/inquiries/inquiry_spec.rb
+- spec/models/refinery/inquiries/setting_spec.rb
 - spec/spec_helper.rb
-has_rdoc: