tb_cms 1.2.0.beta1 → 1.2.0.beta3

data/spec/models/spud_page_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe SpudPage do
+describe SpudPage, :type => :model do
 
 	it {should have_many(:spud_page_partials)}
 	it {should have_many(:spud_pages)}
@@ -12,28 +12,28 @@ describe SpudPage do
 
 		it "should require a name" do
 			p = FactoryGirl.build(:spud_page,:name => nil)
-			p.should_not be_valid
+			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)
-			t.should_not be_valid
+			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")
-			lambda {
+			expect {
         t.valid?
-      }.should change(t, :url_name)
+      }.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")])
-      lambda {
+      expect {
   			t.destroy
-      }.should change(SpudPagePartial, :count).from(1).to(0)
+      }.to change(SpudPagePartial, :count).from(1).to(0)
 		end
 
 
@@ -42,43 +42,25 @@ describe SpudPage do
 	describe "scopes" do
 
 		it "should only show published pages" do
-			SpudPage.published_pages.to_sql.should == SpudPage.where(:published => true).to_sql
+			expect(SpudPage.published_pages.to_sql).to eq(SpudPage.where(:published => true).to_sql)
 		end
 
 		it "should only show parent pages" do
-			SpudPage.parent_pages.to_sql.should == SpudPage.where(:spud_page_id => nil).to_sql
+			expect(SpudPage.parent_pages.to_sql).to eq(SpudPage.where(:spud_page_id => nil).to_sql)
 		end
 
 		it "should only show public pages" do
-			SpudPage.viewable.to_sql.should == SpudPage.where(:visibility => 0).to_sql
-		end
-
-		it "should group pages by parent" do
-			parent_page = FactoryGirl.build(:spud_page,:name => "parent")
-			parent_page.save
-
-			page = FactoryGirl.build(:spud_page,:name => "Page 1")
-			page.spud_page = parent_page
-			page.save
-			page2 = FactoryGirl.build(:spud_page,:name => "Page 2")
-			page2.spud_page = parent_page
-			page2.save
-
-			SpudPage.grouped()[parent_page.id].count.should == 2
-
-
+			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)
 
-			parent_page.is_private?.should == true
+			expect(parent_page.is_private?).to eq(true)
 
 			parent_page.visibility = 0
-			parent_page.is_private?.should == false
+			expect(parent_page.is_private?).to eq(false)
 		end
-
-
 	end
 
 	describe "generate_url_name" do
@@ -89,7 +71,7 @@ describe SpudPage do
 			t.spud_page = parent_page
 			t.valid?
 
-			t.url_name.should == 'about/test'
+			expect(t.url_name).to eq('about/test')
 
 		end
 
@@ -100,7 +82,7 @@ describe SpudPage do
 			page2 = FactoryGirl.build(:spud_page,:name => "testimonials")
 			page2.valid?
 
-			page2.url_name.should == 'testimonials-1'
+			expect(page2.url_name).to eq('testimonials-1')
 		end
 
 		it "should add a counter to url_name if the url_name was once in use by another page that was renamed" do
@@ -112,7 +94,7 @@ describe SpudPage do
 			page2 = FactoryGirl.build(:spud_page,:name => "another")
 			page2.valid?
 
-			page2.url_name.should == 'another-1'
+			expect(page2.url_name).to eq('another-1')
 		end
 
 		it "should destroy historical permalink if a page is renamed back to its previous name" do
@@ -126,9 +108,9 @@ describe SpudPage do
 
 			basecount = SpudPermalink.count
 
-      lambda {
+      expect {
   			page.valid?
-      }.should change(page.spud_permalinks.where(:url_name => 'permapage'), :count).from(1).to(0)
+      }.to change(page.spud_permalinks.where(:url_name => 'permapage'), :count).from(1).to(0)
 		end
 
 		it "should not allow a custom url to be reused by another page" do
@@ -137,7 +119,7 @@ describe SpudPage do
 
 			page = FactoryGirl.build(:spud_page,:name => "new",:use_custom_url_name => true,:url_name => "original")
 
-			page.valid?.should == false
+			expect(page.valid?).to eq(false)
 		end
 
 		it "should not allow a custom url to be reused by another page even if it is a historical permalink" do
@@ -150,13 +132,7 @@ describe SpudPage do
 			page.save
 			page.use_custom_url_name = true
 			page.url_name = 'original'
-			page.valid?.should == false
+			expect(page.valid?).to eq(false)
 		end
-
-
 	end
-
-
-
-
 end

data/spec/models/spud_snippet_spec.rb

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

data/spec/rails_helper.rb

@@ -0,0 +1,72 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require 'spec_helper'
+require 'authlogic_helper'
+require 'rspec/rails'
+require 'database_cleaner'
+require 'simplecov'
+require 'factory_girl_rails'
+require 'shoulda'
+
+SimpleCov.start 'rails'
+
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+#ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  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.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  # config.infer_spec_type_from_file_location!
+
+  # Clean the database as needed
+  # https://github.com/DatabaseCleaner/database_cleaner#rspec-example
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,40 +1,85 @@
-# Track code coverage
-require 'simplecov'
- SimpleCov.start 'rails' do
-  # root "dummy/"
-  add_filter "/factories/"
-end
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] = 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
-require 'rspec/rails'
-require 'rspec/autorun'
-require 'database_cleaner'
-require 'shoulda'
-require 'factory_girl'
-require 'mocha'
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
-Dir[File.join(ENGINE_RAILS_ROOT,"spec/support/**/*.rb"), File.join(ENGINE_RAILS_ROOT,"factories/*")].each {|f| require f}
+# 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
 
-RSpec.configure do |config|
-  config.mock_with :mocha
-  config.use_transactional_fixtures = true
-  config.infer_base_class_for_anonymous_controllers = false
+  # 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!
 
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+  # 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
 
-  config.before(:each) do
-    DatabaseCleaner.start
-  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
 
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
+  # 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
 end