Merge branch 'master' into ajax_dialog_callbacks

Conflicts:
	settings/app/views/refinery/admin/settings/_actions.html.erb

authentication/spec/models/refinery/user_spec.rb

@@ -200,8 +200,8 @@ module Refinery
 
       it "adds registered plugins" do
         first_user.plugins.collect(&:name).should eq(
-          ["refinery_settings", "refinery_users", "refinery_dashboard",
-            "refinery_images", "refinery_files", "refinery_pages"]
+          ["refinery_users", "refinery_dashboard", "refinery_images",
+           "refinery_files", "refinery_pages"]
         )
       end
 

core/lib/generators/refinery/engine/engine_generator.rb

@@ -71,9 +71,9 @@ def attributes_for_translation_table
     def generate
       destination_pathname = Pathname.new(self.destination_root)
       clash_file = Pathname.new(File.expand_path('../clash_keywords.yml', __FILE__))
-      clash_keywords = File.open(clash_file) { |f| doc = YAML.load(f) }
+      clash_keywords = YAML.load_file(clash_file)
       if clash_keywords.member?(singular_name.downcase)
-        puts "Please choose a different name.  Generated code would fail for class '#{singular_name}'"
+        puts "Please choose a different name. Generated code would fail for class '#{singular_name}'"
         puts ""
         exit(1)
       end

core/lib/generators/refinery/engine/templates/Gemfile

@@ -2,7 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-git 'git'
 gem 'refinerycms', '~> 2.0.0', :git => 'git://github.com/resolve/refinerycms.git'
 
 # Refinery/rails should pull in the proper versions of these

core/lib/generators/refinery/engine/templates/spec/spec_helper.rb

@@ -0,0 +1,54 @@
+def setup_environment
+  # Configure Rails Environment
+  ENV["RAILS_ENV"] ||= 'test'
+
+  require File.expand_path("../dummy/config/environment", __FILE__)
+
+  require 'rspec/rails'
+  require 'capybara/rspec'
+  require 'factory_girl_rails'
+
+  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
+
+  # set javascript driver for capybara
+  Capybara.javascript_driver = :selenium
+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
+end

core/lib/generators/refinery/form/form_generator.rb

@@ -45,7 +45,7 @@ def generate
           end
         end
       else
-        puts "You must specify a name and at least one field. For help: rails generate refinery_form"
+        puts "You must specify a name and at least one field. For help: rails generate refinery:form"
       end
     end
 

core/lib/refinery/core.rb

@@ -20,10 +20,6 @@ module Refinery
   autoload :Crud, 'refinery/crud'
   autoload :BasePresenter, 'refinery/base_presenter'
 
-  # These have to be specified after the autoload to correct load issues on some systems.
-  # As per commit 12af0e3e83a147a87c97bf7b29f343254c5fcb3c
-  require 'refinerycms-settings'
-
   require 'refinery/ext/action_view/helpers/form_builder'
   require 'refinery/ext/action_view/helpers/form_helper'
   require 'refinery/ext/action_view/helpers/form_tag_helper'

core/refinerycms-core.gemspec

@@ -32,6 +32,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'coffee-rails',                '~> 3.2.1'
   s.add_dependency 'uglifier',                    '>= 1.0.3'
   s.add_dependency 'jquery-rails',                '~> 2.0.0'
-
-  s.add_dependency 'refinerycms-settings',        version
 end

core/spec/lib/generators/refinery/engine/engine_generator_spec.rb

@@ -59,6 +59,9 @@ module Refinery
               directory "lib" do
                 file "refinerycms-rspec_product_tests.rb"
               end
+              directory "spec" do
+                file "spec_helper.rb"
+              end
               directory "tasks" do
                 file "testing.rake"
                 file "rspec.rake"

core/spec/lib/generators/refinery/engine/engine_generator_with_i18n_spec.rb

@@ -60,6 +60,9 @@ module Refinery
               directory "lib" do
                 file "refinerycms-rspec_product_tests.rb"
               end
+              directory "spec" do
+                file "spec_helper.rb"
+              end
               directory "tasks" do
                 file "testing.rake"
                 file "rspec.rake"

core/spec/lib/generators/refinery/engine/engine_generator_without_frontend_spec.rb

@@ -59,6 +59,9 @@ module Refinery
               directory "lib" do
                 file "refinerycms-rspec_product_tests.rb"
               end
+              directory "spec" do
+                file "spec_helper.rb"
+              end
               directory "config" do
                 directory "locales" do
                   file "en.yml"

core/spec/requests/refinery/search_spec.rb

@@ -37,17 +37,6 @@ module Refinery
           page.should have_content("Ugis Ozols")
         end
       end
-
-      describe "setting engine" do
-        before(:each) { Refinery::Setting.set(:testy, true) }
-
-        it "returns found setting" do
-          visit refinery.admin_settings_path
-          fill_in "search", :with => "testy"
-          click_button "Search"
-          page.should have_content("Testy - true")
-        end
-      end
     end
 
     context "when searched item don't exist" do
@@ -77,13 +66,6 @@ def shared_stuff
           shared_stuff
         end
       end
-
-      describe "setting engine" do
-        it "returns no results" do
-          visit refinery.admin_settings_path
-          shared_stuff
-        end
-      end
     end
   end
 end

refinerycms.gemspec

@@ -18,15 +18,14 @@ Gem::Specification.new do |s|
   s.bindir            = 'bin'
   s.executables       = %w(refinerycms)
   s.require_paths     = %w(lib)
-  
+
   s.files             = `git ls-files -- lib/*`.split("\n")
-  
+
   s.add_dependency    'bundler',                    '~> 1.0'
   s.add_dependency    'refinerycms-authentication', version
   s.add_dependency    'refinerycms-core',           version
   s.add_dependency    'refinerycms-dashboard',      version
   s.add_dependency    'refinerycms-images',         version
   s.add_dependency    'refinerycms-pages',          version
   s.add_dependency    'refinerycms-resources',      version
-  s.add_dependency    'refinerycms-settings',       version
 end