tb_cms 1.2.3 → 1.3.beta1

data/spec/models/spud_page_spec.rb

@@ -1,96 +1,95 @@
 require 'rails_helper'
 
-describe SpudPage, :type => :model do
-
-	it {should have_many(:spud_page_partials)}
-	it {should have_many(:spud_pages)}
-	it {should belong_to(:spud_page)}
-	it {should belong_to(:created_by_user)}
-	it {should belong_to(:updated_by_user)}
-
-	describe "validations" do
-
-		it "should require a name" do
-			p = FactoryGirl.build(:spud_page,:name => nil)
-			expect(p).to_not be_valid
-		end
-
-		it "should require a unique url_name" do
-			FactoryGirl.create(:spud_page, :url_name => "test", :use_custom_url_name => true)
-			t = FactoryGirl.build(:spud_page, :url_name => "test", :use_custom_url_name => true)
-			expect(t).to_not be_valid
-		end
-
-		it "should generate a url_name if taken" do
-			FactoryGirl.create(:spud_page, :name => "test")
-			t = FactoryGirl.build(:spud_page, :name => "test")
-			expect {
+describe SpudPage, type: :model do
+
+  it { should have_many(:spud_page_partials) }
+  it { should have_many(:spud_pages) }
+  it { should belong_to(:spud_page) }
+  it { should belong_to(:created_by_user) }
+  it { should belong_to(:updated_by_user) }
+
+  describe 'validations' do
+
+    it 'should require a name' do
+      p = FactoryGirl.build(:spud_page, name: nil)
+      expect(p).to_not be_valid
+    end
+
+    it 'should require a unique url_name' do
+      FactoryGirl.create(:spud_page, url_name: 'test', use_custom_url_name: true)
+      t = FactoryGirl.build(:spud_page, url_name: 'test', use_custom_url_name: true)
+      expect(t).to_not be_valid
+    end
+
+    it 'should generate a url_name if taken' do
+      FactoryGirl.create(:spud_page, name: 'test')
+      t = FactoryGirl.build(:spud_page, name: 'test')
+      expect do
         t.valid?
-      }.to change(t, :url_name)
-		end
-
-		it "should dependantly destroy page_partials" do
-			t = FactoryGirl.create(:spud_page, :spud_page_partials => [SpudPagePartial.new(:name => "body")])
-      expect {
-  			t.destroy
-      }.to change(SpudPagePartial, :count).from(1).to(0)
-		end
-
-
-	end
-
-	describe "scopes" do
-
-		it "should only show published pages" do
-			expect(SpudPage.published_pages.to_sql).to eq(SpudPage.where(:published => true).to_sql)
-		end
-
-		it "should only show parent pages" do
-			expect(SpudPage.parent_pages.to_sql).to eq(SpudPage.where(:spud_page_id => nil).to_sql)
-		end
-
-		it "should only show public pages" do
-			expect(SpudPage.viewable.to_sql).to eq(SpudPage.where(:visibility => 0).to_sql)
-		end
-
-		it "should return private if visibility is == 1" do
-			parent_page = FactoryGirl.build(:spud_page,:name => "parent",:visibility => 1)
-
-			expect(parent_page.is_private?).to eq(true)
-
-			parent_page.visibility = 0
-			expect(parent_page.is_private?).to eq(false)
-		end
-	end
-
-	describe "#generate_url_name" do
-		it 'should use the provided url' do
-			@page = FactoryGirl.create(:spud_page, :url_name => 'test')
-			expect(@page.url_name).to eq('test')
-		end
-
-		it 'should generate a url based on the page name' do
-			@page = FactoryGirl.create(:spud_page, :name => 'Hello World')
-			expect(@page.url_name).to eq('hello-world')
-		end
-
-		it 'should generate a url based on the page name and parent page' do
-			@parent = FactoryGirl.create(:spud_page, :name => 'About Us')
-			@page = FactoryGirl.create(:spud_page, :name => 'Hello World', :spud_page => @parent)
-			expect(@page.url_name).to eq('about-us/hello-world')
-		end
-	end
-
-	describe '#create_redirect_if_necessary' do
-		it 'should create a redirect' do
-			page = FactoryGirl.create(:spud_page, :url_name => 'page-a')
-			expect{
-				page.update(:url_name => 'page-b')
-			}.to change(page.tb_redirects, :count).by(1)
-			redirect = page.tb_redirects.last
-			expect(redirect.source).to eq('/page-a')
-			expect(redirect.destination).to eq('/page-b')
-		end
-	end
+      end.to change(t, :url_name)
+    end
+
+    it 'should dependantly destroy page_partials' do
+      t = FactoryGirl.create(:spud_page, spud_page_partials: [SpudPagePartial.new(name: 'body')])
+      expect do
+        t.destroy
+      end.to change(SpudPagePartial, :count).from(1).to(0)
+    end
+
+  end
+
+  describe 'scopes' do
+
+    it 'should only show published pages' do
+      expect(SpudPage.published_pages.to_sql).to eq(SpudPage.where(published: true).to_sql)
+    end
+
+    it 'should only show parent pages' do
+      expect(SpudPage.parent_pages.to_sql).to eq(SpudPage.where(spud_page_id: nil).to_sql)
+    end
+
+    it 'should only show public pages' do
+      expect(SpudPage.viewable.to_sql).to eq(SpudPage.where(visibility: 0).to_sql)
+    end
+
+    it 'should return private if visibility is == 1' do
+      parent_page = FactoryGirl.build(:spud_page, name: 'parent', visibility: 1)
+
+      expect(parent_page.is_private?).to eq(true)
+
+      parent_page.visibility = 0
+      expect(parent_page.is_private?).to eq(false)
+    end
+  end
+
+  describe '#generate_url_name' do
+    it 'should use the provided url' do
+      @page = FactoryGirl.create(:spud_page, url_name: 'test')
+      expect(@page.url_name).to eq('test')
+    end
+
+    it 'should generate a url based on the page name' do
+      @page = FactoryGirl.create(:spud_page, name: 'Hello World')
+      expect(@page.url_name).to eq('hello-world')
+    end
+
+    it 'should generate a url based on the page name and parent page' do
+      @parent = FactoryGirl.create(:spud_page, name: 'About Us')
+      @page = FactoryGirl.create(:spud_page, name: 'Hello World', spud_page: @parent)
+      expect(@page.url_name).to eq('about-us/hello-world')
+    end
+  end
+
+  describe '#create_redirect_if_necessary' do
+    it 'should create a redirect' do
+      page = FactoryGirl.create(:spud_page, url_name: 'page-a')
+      expect do
+        page.update(url_name: 'page-b')
+      end.to change(page.tb_redirects, :count).by(1)
+      redirect = page.tb_redirects.last
+      expect(redirect.source).to eq('/page-a')
+      expect(redirect.destination).to eq('/page-b')
+    end
+  end
 
 end

data/spec/models/spud_snippet_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
-describe SpudSnippet, :type => :model do
+describe SpudSnippet, type: :model do
   pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/rails_helper.rb

@@ -1,13 +1,14 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
 require 'spec_helper'
-require 'authlogic_helper'
 require 'rspec/rails'
+require 'rails-controller-testing'
 require 'database_cleaner'
 require 'simplecov'
 require 'factory_girl_rails'
+require 'tb_core/test_helper'
 require 'shoulda'
 
 SimpleCov.start 'rails'
@@ -31,12 +32,18 @@ SimpleCov.start 'rails'
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
-#ActiveRecord::Migration.maintain_test_schema!
+# ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
+  [:controller, :view, :request].each do |type|
+    config.include ::Rails::Controller::Testing::TestProcess, type: type
+    config.include ::Rails::Controller::Testing::TemplateAssertions, type: type
+    config.include ::Rails::Controller::Testing::Integration, type: type
+  end
+
   config.raise_errors_for_deprecations!
   config.infer_base_class_for_anonymous_controllers = false
-  
+
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
@@ -68,5 +75,4 @@ RSpec.configure do |config|
       example.run
     end
   end
-  
 end

data/spec/spec_helper.rb

@@ -38,48 +38,46 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is recommended.
-  # For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # These two settings work together to allow you to limit a spec run
+  #   # to individual examples or groups you care about by tagging them with
+  #   # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  #   # get run.
+  #   config.filter_run :focus
+  #   config.run_all_when_everything_filtered = true
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  #   # For more details, see:
+  #   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  #   config.disable_monkey_patching!
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = 'doc'
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by providing
+  #   # the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
 end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.beta1
 platform: ruby
 authors:
-- Westlake Design
+- Moser Consulting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: tb_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.4.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.4.beta2
 - !ruby/object:Gem::Dependency
   name: tb_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.beta1
 - !ruby/object:Gem::Dependency
   name: tb_liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.beta1
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -70,75 +84,89 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
 description: Content management engine for Twice Baked
 email:
-- greg@westlakedesign.com
+- greg.woods@moserit.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -230,7 +258,6 @@ files:
 - lib/spud_cms/version.rb
 - lib/tasks/spud_cms_tasks.rake
 - lib/tb_cms.rb
-- spec/authlogic_helper.rb
 - spec/controllers/admin/menu_items_controller_spec.rb
 - spec/controllers/admin/menus_controller_spec.rb
 - spec/controllers/admin/pages_controller_spec.rb
@@ -314,7 +341,7 @@ files:
 - spec/models/spud_snippet_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
-homepage: http://bitbucket.org/westlakedesign/tb_cms
+homepage: http://bitbucket.org/moser-inc/tb_cms
 licenses: []
 metadata: {}
 post_install_message: 
@@ -328,17 +355,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Twice Baked CMS
 test_files:
-- spec/authlogic_helper.rb
 - spec/controllers/admin/menu_items_controller_spec.rb
 - spec/controllers/admin/menus_controller_spec.rb
 - spec/controllers/admin/pages_controller_spec.rb

data/spec/authlogic_helper.rb

@@ -1,2 +0,0 @@
-require 'authlogic/test_case'
-include Authlogic::TestCase