tb_core 1.3.0.beta2 → 1.3.0

data/spec/lib/spud_core/configuration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Spud::Core do
 
@@ -7,27 +7,6 @@ describe Spud::Core do
       config.site_id = 0
       config.site_name = "Default Site"
       config.short_name = "default"
-      config.multisite_mode_enabled = true
-      config.multisite_config = [{:hosts => ["test.host"], :site_name =>"Site B", :short_name => 'site_b', :site_id => 1}]
-    end
-  end
-
-  describe :site_config_for_id do
-    it "should should return the default site config" do
-      config = Spud::Core.site_config_for_id(0)
-      config.should == {:site_name =>"Default Site", :short_name => 'default', :site_id => 0}
-    end
-
-    it "should return the config for Site B" do
-      config = Spud::Core.site_config_for_id(1)
-      config.should == {:hosts => ["test.host"], :site_name =>"Site B", :short_name => 'site_b', :site_id => 1}
-    end
-  end
-
-  describe :default_site_config do
-    it "should return the default site config" do 
-      config = Spud::Core.default_site_config
-      config.should == {:site_name =>"Default Site", :short_name => 'default', :site_id => 0}
     end
   end
 

data/spec/models/spud_role_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe SpudRole do
+describe SpudRole, :type => :model do
 
 	before :each do
 		@role = FactoryGirl.build(:spud_role)
@@ -13,8 +13,8 @@ describe SpudRole do
 
 	describe "permissions" do
 		it "should return an array of SpudPermission objects" do
-			@role.permissions.should be_an_instance_of(Array)
-			@role.permissions.first.should be_an_instance_of(SpudPermission)
+			expect(@role.permissions).to be_an_instance_of(Array)
+			expect(@role.permissions.first).to be_an_instance_of(SpudPermission)
 		end
 	end
 
@@ -23,14 +23,14 @@ describe SpudRole do
 			original_count = @role.spud_role_permissions.length
 			@role.permissions = [@full_access, @partial_access]
 			@role.save
-			@role.spud_role_permissions.length.should be > original_count
+			expect(@role.spud_role_permissions.length).to be > original_count
 		end
 	end
 
 	describe "permission_tags" do
 		it "should return an array of Strings" do
-			@role.permission_tags.should be_an_instance_of(Array)
-			@role.permission_tags.first.should be_an_instance_of(String)
+			expect(@role.permission_tags).to be_an_instance_of(Array)
+			expect(@role.permission_tags.first).to be_an_instance_of(String)
 		end
 	end
 
@@ -39,7 +39,7 @@ describe SpudRole do
 			original_count = @role.spud_role_permissions.length
 			@role.permission_tags = ['admin.test.full_access', 'admin.test.partial_access']
 			@role.save
-			@role.spud_role_permissions.length.should be > original_count
+			expect(@role.spud_role_permissions.length).to be > original_count
 		end
 	end
 

data/spec/models/spud_user_spec.rb

@@ -1,26 +1,26 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe SpudUser do
+describe SpudUser, :type => :model do
 
   describe ".full_name" do
     it "should return the full name if the first and last name are not blank" do
       u = FactoryGirl.build(:spud_user)
-      u.full_name.should == "#{u.first_name} #{u.last_name}"
+      expect(u.full_name).to  eq("#{u.first_name} #{u.last_name}")
     end
   
     it "should return only the last name if the first name is blank" do
       u = FactoryGirl.build(:spud_user, :first_name => nil)
-      u.full_name.should == u.last_name
+      expect(u.full_name).to  eq(u.last_name)
     end
   
     it "should return only the first name if the last name is blank" do
       u = FactoryGirl.build(:spud_user, :last_name => nil)
-      u.full_name.should == u.first_name
+      expect(u.full_name).to  eq(u.first_name)
     end
   
     it "should return the login if the first and last name are blank" do
       u = FactoryGirl.build(:spud_user, :first_name => nil, :last_name => nil)
-      u.full_name.should == u.login
+      expect(u.full_name).to  eq(u.login)
     end
   end
 
@@ -33,7 +33,7 @@ describe SpudUser do
 
   it "must match password confirmation before saving a new user" do
     u = FactoryGirl.build(:spud_user, :password_confirmation => '')
-    u.save.should == false
+    expect(u.save).to eq(false)
   end
 
-end
+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,43 +1,85 @@
-# Track code coverage
-require 'simplecov'
- SimpleCov.start 'rails' do
-  # root "dummy/"
-  add_filter "/factories/"
-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'
-require 'capybara/rspec'
-require 'capybara/rails'
-
-# 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}
-
+# 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|
-  config.mock_with :mocha
-  config.use_transactional_fixtures = true
-  config.infer_base_class_for_anonymous_controllers = false
-  config.include Capybara::DSL
-  
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+  # 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
 
-  config.before(:each) do
-    DatabaseCleaner.start
+  # 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
 
-  config.after(:each) do
-    DatabaseCleaner.clean
+# 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
 end