refinerycms-inquiries 2.0.3 → 2.1.0

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

@@ -0,0 +1,41 @@
+require "spec_helper"
+require "capybara/email/rspec"
+
+module Refinery
+  module Inquiries
+    describe "mailer" do
+      before do
+        FactoryGirl.create(:page, :link_url => "/contact")
+
+        Refinery::Inquiries::Setting.stub(: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!"
+        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.")
+      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.")
+      end
+    end
+  end
+end

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

@@ -5,10 +5,10 @@ module Refinery
     describe Inquiry do
       describe "validations" do
         subject do
-          Factory.build(:inquiry,
-                        :name => "Ugis Ozols",
-                        :email => "ugis.ozols@refinerycms.com",
-                        :message => "Hey, I'm testing!")
+          FactoryGirl.build(:inquiry,
+                            :name => "Ugis Ozols",
+                            :email => "ugis.ozols@refinerycms.com",
+                            :message => "Hey, I'm testing!")
         end
 
         it { should be_valid }
@@ -20,8 +20,8 @@ module Refinery
 
       describe "default scope" do
         it "orders by created_at in desc" do
-          inquiry1 = Factory(:inquiry, :created_at => 1.hour.ago)
-          inquiry2 = Factory(:inquiry, :created_at => 2.hours.ago)
+          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
@@ -30,19 +30,19 @@ module Refinery
 
       describe ".latest" do
         it "returns latest 7 non-spam inquiries by default" do
-          8.times { Factory(:inquiry) }
+          8.times { FactoryGirl.create(:inquiry) }
           Refinery::Inquiries::Inquiry.last.toggle!(:spam)
           Refinery::Inquiries::Inquiry.latest.length.should == 7
         end
 
         it "returns latest 7 inquiries including spam ones" do
-          7.times { Factory(:inquiry) }
+          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
         end
 
         it "returns latest n inquiries" do
-          4.times { Factory(:inquiry) }
+          4.times { FactoryGirl.create(:inquiry) }
           Refinery::Inquiries::Inquiry.latest(3).length.should == 3
         end
       end

data/spec/spec_helper.rb

@@ -1,53 +1,27 @@
 require 'rubygems'
 
-def setup_environment
-  # Configure Rails Environment
-  ENV["RAILS_ENV"] ||= 'test'
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= 'test'
 
-  require File.expand_path("../dummy/config/environment", __FILE__)
+require File.expand_path("../dummy/config/environment", __FILE__)
 
-  require 'rspec/rails'
-  require 'capybara/rspec'
-  require 'factory_girl_rails'
+require 'rspec/rails'
+require 'capybara/rspec'
+require 'factory_girl_rails'
 
-  Rails.backtrace_cleaner.remove_silencers!
+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.run_all_when_everything_filtered = true
-  end
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end
 
-def each_run
-  ActiveSupport::Dependencies.clear
-
-  FactoryGirl.reload
-
-  # Requires supporting files with custom matchers and macros, etc,
-  # in ./support/ and its subdirectories including factories.
-  ([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
-    Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
-  }.flatten.sort.each do |support_file|
-    require support_file
-  end
-end
-
-# If spork is available in the Gemfile it'll be used but we don't force it.
-unless (begin; require 'spork'; rescue LoadError; nil end).nil?
-  Spork.prefork do
-    # Loading more in this block will cause your tests to run faster. However,
-    # if you change any configuration or code from libraries loaded here, you'll
-    # need to restart spork for it take effect.
-    setup_environment
-  end
-
-  Spork.each_run do
-    # This code will be run each time you run your specs.
-    each_run
-  end
-else
-  setup_environment
-  each_run
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories including factories.
+([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
+  Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
+}.flatten.sort.each do |support_file|
+  require support_file
 end

metadata

@@ -1,54 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-inquiries
 version: !ruby/object:Gem::Version
-  version: 2.0.3
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
-- Philip Arndt
 - Uģis Ozols
-- David Jones
+- Philip Arndt
+- Rob Yurkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-settings
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: filters_spam
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +64,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Guardfile
 - Rakefile
 - app/assets/stylesheets/refinery/inquiries/inquiries.css.scss
 - app/controllers/refinery/inquiries/admin/inquiries_controller.rb
@@ -101,7 +93,6 @@ files:
 - config/locales/es.yml
 - config/locales/fr.yml
 - config/locales/it.yml
-- config/locales/lolcat.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
 - config/locales/nb.yml
@@ -126,39 +117,41 @@ files:
 - readme.md
 - refinerycms-inquiries.gemspec
 - spec/factories/inquiry.rb
+- spec/features/refinery/inquiries/admin/inquiries_spec.rb
+- spec/features/refinery/inquiries/inquiries_spec.rb
+- spec/features/refinery/inquiries/mailer_spec.rb
 - spec/models/refinery/inquiries/inquiry_spec.rb
-- spec/requests/refinery/inquiries/admin/inquiries_spec.rb
-- spec/requests/refinery/inquiries/inquiries_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 homepage: http://refinerycms.com
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Inquiry handling functionality for the Refinery CMS project.
 test_files:
 - spec/factories/inquiry.rb
+- spec/features/refinery/inquiries/admin/inquiries_spec.rb
+- spec/features/refinery/inquiries/inquiries_spec.rb
+- spec/features/refinery/inquiries/mailer_spec.rb
 - spec/models/refinery/inquiries/inquiry_spec.rb
-- spec/requests/refinery/inquiries/admin/inquiries_spec.rb
-- spec/requests/refinery/inquiries/inquiries_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/Guardfile

@@ -1,20 +0,0 @@
-guard 'rspec', :version => 2, :cli => "--color" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/controllers/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('spec/spec_helper.rb')                        { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-end
-
-guard 'spork', :wait => 60, :cucumber => false, :rspec_env => { 'RAILS_ENV' => 'test' } do
-  watch('config/application.rb')
-  watch('config/environment.rb')
-  watch(%r{^config/environments/.+\.rb$})
-  watch(%r{^config/initializers/.+\.rb$})
-  watch('spec/spec_helper.rb')
-end

data/config/locales/lolcat.yml

@@ -1,78 +0,0 @@
-lolcat:
-  refinery:
-    plugins:
-      refinerycms_inquiries:
-        title: INQUIRIEZ
-        description: PROVIDEZ CONTACT FORM AN STOREZ INQUIRIEZ
-    inquiries:
-      inquiries:
-        new:
-          send: SEND MESAGE
-          privacy_policy: WE VALUE UR PRIVACY
-      admin:
-        inquiries:
-          delete: REMOOV DIS INQUIRY FOREVR
-          inquiry:
-            read_inquiry: READ TEH INQUIRY
-            said: SED
-            mark_as_spam: MARK AS SPAM
-            mark_as_ham: MOOV 2 INBOX
-          submenu:
-            inbox: INBOX
-            spam: SPAM
-            update_notified: UPDATE HOO GETS NOTIFID
-            edit_confirmation_email: EDIT CONFIRMASHUN EMAIL
-          index:
-            no_inquiries: U HAS NOT RECEIVD ANY INQUIRIEZ YET.
-            no_spam: HOORAH! U DOAN HAS ANY SPAM.
-          show:
-            details: DETAILS
-            age: AGE
-            actions: ACSHUNS
-            back_to_all_inquiries: BAK 2 ALL INQUIRIEZ
-            spam: SPAM
-            spam_yes: YEZ
-            inquiry: INQUIRY
-            to: 2
-            from: FRUM
-            click_to_email: CLICK 2 EMAIL DIS ADDRES
-            phone: FONE
-            date: DATE
-            message: MESAGE
-        settings:
-          notification_recipients_form:
-            inquiry_settings_value_name: SEND NOTIFICASHUNS 2
-            explanation: EVRY TIEM SOMEONE CONTACTS U ON UR WEBSIET, REFINERY SENDZ OUT AN EMAIL 2 SAY THAR IZ NEW INQUIRY.
-            hint: WHEN NEW INQUIRY IZ SUBMITTD, REFINERY WILL SEND AN EMAIL NOTIFICASHUN 2 U.
-            example: "ENTR UR EMAIL ADDRES(EZ) LIEK: JACK@WERK.COM, JILL@OFFICE.COM"
-          confirmation_email_form:
-            to: 2
-            from: FRUM
-            subject: SUBJECT
-            click_to_edit_subject: CLICK HER 2 EDIT TEH SUBJECT
-            explanation: EVRY TIEM SOMEONE CONTACTS U ON UR WEBSIET, REFINERY SENDZ OUT AN EMAIL 2 CONFIRM TEH INQUIRY WIF TEH PERSON HOO MADE IT.
-            below_edit_email_sent: BELOW U CAN EDIT TEH EMAIL DAT IZ SENT OUT.
-            the_customer_making_inquiry: TEH CUSTOMR MAKIN TEH INQUIRY
-            message: MESAGE
-            note: "Note: PLACE TEH TEXT %NAYM% WER UD LIEK TEH CUSTOMERS NAYM 2 APPEAR IN DA EMAIL"
-      inquiry_mailer:
-        notification:
-          greeting: OH HAI THAR
-          you_recieved_new_inquiry: U JUS RECEIVD NEW INQUIRY ON UR WEBSIET.
-          inquiry_starts: --- INQUIRY STARTS ---
-          inquiry_ends: --- INQUIRY ENDZ ---
-          from: FRUM
-          email: EMAIL
-          phone: FONE
-          message: MESAGE
-          closing_line: KIND REGARDZ
-          ps: P.S. ALL UR INQUIRIEZ R STORD IN DA "INQUIRIEZ" SECSHUN OV REFINERY SHUD U EVR WANTS 2 VIEW IT LATR THAR.
-  activerecord:
-    models:
-      refinery/inquiries/inquiry: INQUIRY
-    attributes:
-      refinery/inquiries/inquiry:
-        name: NAYM
-        email: EMAIL
-        phone: FONE
-        message: MESAGE

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

@@ -1,81 +0,0 @@
-require "spec_helper"
-
-module Refinery
-  module Inquiries
-    describe "inquiries" do
-      before(:each) do
-        Factory(:refinery_user)
-
-        # load in seeds we use in migration
-        Refinery::Inquiries::Engine.load_seed
-      end
-
-      context "when valid data" do
-        it "is successful" do
-          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!"
-          click_button "Send message"
-
-          page.current_path.should == refinery.thank_you_inquiries_inquiries_path
-          page.should 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='/']")
-          end
-
-          Refinery::Inquiries::Inquiry.count.should == 1
-        end
-      end
-
-      context "when invalid data" do
-        it "is not successful" do
-          visit refinery.inquiries_new_inquiry_path
-
-          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 can't be blank")
-          page.should have_content("Email is invalid")
-          page.should have_content("Message can't be blank")
-          page.should have_no_content("Phone can't be blank")
-
-          Refinery::Inquiries::Inquiry.count.should == 0
-        end
-      end
-
-      describe "privacy" do
-        context "when show contact privacy link setting set to false" do
-          before(:each) do
-            Refinery::Inquiries.stub(: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']")
-          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)
-          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']")
-          end
-        end
-      end
-    end
-  end
-end