Merge branch 'guange_dev' into szzh

.rspec

@@ -1,2 +1,2 @@
---format documentation
 --color
+--require spec_helper

Gemfile

@@ -28,28 +28,21 @@ gem "rmagick", ">= 2.0.0"
 
 group :development do
   gem 'grape-swagger'
-  #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
+  gem 'better_errors', '~> 1.1.0'
-  gem 'puma' if RbConfig::CONFIG['host_os'] =~ /linux/
+  gem 'rack-mini-profiler', '~> 0.9.3'
+end
+
+group :development, :test do 
+  unless RUBY_PLATFORM =~ /w32/
     gem 'pry-rails'
     if RUBY_VERSION >= '2.0.0'
       gem 'pry-byebug'
-  else
-    # gem 'pry-debugger'
     end
     gem 'pry-stack_explorer'
-  gem 'better_errors', '~> 1.1.0'
+  end
-  gem 'rack-mini-profiler', '~> 0.9.3'
-end
-
-group :test do
-  gem "shoulda", "~> 3.5.0"
-  gem "mocha", "~> 1.1.0"
-  gem 'capybara', '~> 2.4.1'
-  gem 'nokogiri', '~> 1.6.3'
-  gem 'factory_girl', '~> 4.4.0'
-  gem 'selenium-webdriver', '~> 2.42.0'
 
-  gem "faker"
+  gem 'rspec-rails', '~> 3.0'
+  gem 'factory_girl_rails'
 end
 
 # Gems used only for assets and not required

lib/rails_kindeditor/lib/rails_kindeditor/helper.rb

@@ -6,7 +6,7 @@ module RailsKindeditor
       input_html = { :id => id }.merge(options.delete(:input_html) || {})
       output = ActiveSupport::SafeBuffer.new
       output << text_area_tag(name, content, input_html)
-      output << javascript_tag(js_replace(id, options))
+      output << javascript_tag(js_replace(id, options.merge(window_onload: 'true')))
     end
     
     def kindeditor(name, method, options = {})
@@ -14,7 +14,7 @@ module RailsKindeditor
       input_html = (options.delete(:input_html) || {}).stringify_keys
       output_buffer = ActiveSupport::SafeBuffer.new
       output_buffer << build_text_area_tag(name, method, self, options, input_html)
-      output_buffer << javascript_tag(js_replace(input_html['id'], options))
+      output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true')))
     end
     
     def kindeditor_upload_json_path(*args)
@@ -50,13 +50,13 @@ module RailsKindeditor
         "var old_onload_#{random_name};
         if(typeof window.onload == 'function') old_onload_#{random_name} = window.onload;
         window.onload = function() {
-          #{editor_id}KindEditor.create('##{dom_id}', #{get_options(options).to_json});
+          #{editor_id}KindEditor.create('##{dom_id}', #{get_options(options).to_json}).loadPlugin('paste');
           if(old_onload_#{random_name}) old_onload_#{random_name}();
         }"
       else
-        "$(function(){KindEditor.ready(function(K){
+        "KindEditor.ready(function(K){
           #{editor_id}K.create('##{dom_id}', #{get_options(options).to_json}).loadPlugin('paste');
-        });});"
+        });"
       end
     end
 

public/stylesheets/application.css

@@ -2779,3 +2779,4 @@ div.repos_explain{
 	padding-top: 20px;
 	padding-bottom: 20px;
 }
+.upload_img img{max-width: 580px;}

public/stylesheets/public.css

@@ -422,3 +422,5 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 
 /*文本左对齐*/
 .tl{text-align: left;}
+img{max-width: 100%;}
+.attachments {clear: both;}

spec/controllers/enterprises_controller_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe EnterprisesController do
-
-  describe "GET 'index'" do
-    it "returns http success" do
-      get 'index'
-      response.should be_success
-    end
-  end
-
-end

spec/factories/users.rb

@@ -1,4 +1,3 @@
-require 'faker'
 
 FactoryGirl.define do
   factory :user do

spec/rails_helper.rb

@@ -0,0 +1,46 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV['RAILS_ENV'] ||= 'test'
+require 'spec_helper'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rspec/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 }
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # 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!
+end

spec/requests/account_request_spec.rb

@@ -0,0 +1,71 @@
+require 'rails_helper'
+
+RSpec.describe "Account request", :type => :request do
+  describe "用户登录" do
+    let(:user){FactoryGirl.create(:user)}
+
+    it "未登录访问需要登录页面会自动跳入登录页" do
+      get 'my/page'
+      expect(response).to redirect_to(signin_path)
+    end
+
+    context "正常登录" do
+      before{post signin_path, username: user.login, password: user.password}
+      it "登录成功，正常跳转" do
+        expect(response).to redirect_to(my_account_url)
+      end
+
+      it "登录成功，session正确" do
+        expect(user.id).to eq(session[:user_id])
+      end
+
+      it "正常登录后可以访问需要认证的页面" do
+        get 'my/account'
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include(user.login)
+      end
+    end
+
+    context "登录失败" do
+      before{post signin_path, username: user.login, password: 'wrong password'}
+      it {expect(response).to render_template('account/login')}
+      it "跳加登录页面" do
+        get 'my/page'
+        expect(response).to redirect_to(signin_path)
+      end
+    end
+
+    context "自动登录" do
+      before{
+        post signin_path, username: user.login, password: user.password, autologin: 1
+      }
+      it "登录成功跳转到个人首页" do
+        expect(response).to redirect_to(my_account_url)
+      end
+
+      it "验证token" do
+        token = Token.first
+        expect(token).not_to be_nil
+        expect(user.id).to eq(token.user.id)
+        expect(token.action).to eq('autologin')
+        expect(user.id).to eq(session[:user_id])
+        expect(token.value).to eq(cookies['autologin'])
+      end
+      
+      it 'session 失效后，可以用token自动重新登录' do
+        token = Token.first
+        reset!
+        User.current = nil
+        get my_account_url
+        expect(response).to redirect_to(signin_url)
+        cookies[:autologin] = token.value
+        get my_account_url
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include(user.login)
+      end
+
+    end
+
+  end
+end
+

spec/spec_helper.rb

@@ -1,38 +1,91 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
+require 'rubygems'
-ENV["RAILS_ENV"] ||= 'test'
+require 'rspec/core'
-require File.expand_path("../../config/environment", __FILE__)
+# require_relative 'support/spork_patch'
-require 'rspec/rails'
-require 'rspec/autorun'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].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|
-  # ## Mock Framework
+  # rspec-expectations config goes here. You can use an alternate
-  #
+  # assertion/expectation library such as wrong or the stdlib/minitest
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  # assertions if you prefer.
-  #
+  config.expect_with :rspec do |expectations|
-  # config.mock_with :mocha
+    # This option will default to `true` in RSpec 4. It makes the `description`
-  # config.mock_with :flexmock
+    # and `failure_message` of custom matchers include text for helper methods
-  # config.mock_with :rr
+    # defined using `chain`, e.g.:
-
+    #     be_bigger_than(2).and_smaller_than(4).description
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+    #     # => "be bigger than 2 and smaller than 4"
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+    # ...rather than:
-
+    #     # => "be bigger than 2"
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  # examples within a transaction, remove the following line or assign false
+  end
-  # instead of true.
+
-  config.use_transactional_fixtures = true
+  # 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.
-  # If true, the base class of anonymous controllers will be inferred
+  config.mock_with :rspec do |mocks|
-  # automatically. This will be the default behavior in future versions of
+    # Prevents you from mocking or stubbing a method that does not exist on
-  # rspec-rails.
+    # a real object. This is generally recommended, and will default to
-  config.infer_base_class_for_anonymous_controllers = false
+    # `true` in RSpec 4.
+    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"
+  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

spec/support/spork_patch.rb

@@ -0,0 +1,22 @@
+# https://stackoverflow.com/questions/24030907/spork-0-9-2-and-rspec-3-0-0-uninitialized-constant-rspeccorecommandline-n/24085168#24085168
+# https://github.com/manafire/spork/commit/38c79dcedb246daacbadb9f18d09f50cc837de51#diff-937afaa19ccfee172d722a05112a7c6fL6
+
+ class Spork::TestFramework::RSpec
+   def run_tests(argv, stderr, stdout)
+     if rspec1?
+       ::Spec::Runner::CommandLine.run(
+         ::Spec::Runner::OptionParser.parse(argv, stderr, stdout)
+       )
+    elsif rspec3?
+      options = ::RSpec::Core::ConfigurationOptions.new(argv)
+      ::RSpec::Core::Runner.new(options).run(stderr, stdout)
+     else
+       ::RSpec::Core::CommandLine.new(argv).run(stderr, stdout)
+     end
+   end
+
+  def rspec3?
+    return false if !defined?(::RSpec::Core::Version::STRING)
+    ::RSpec::Core::Version::STRING =~ /^3\./
+  end
+end

test/integration/account_test.rb

@@ -44,7 +44,7 @@ class AccountTest < ActionController::IntegrationTest
 
     # User logs in with 'autologin' checked
     post '/login', :username => user.login, :password => 'admin', :autologin => 1
-    assert_redirected_to '/my/page'
+    assert_redirected_to '/users/1'
     token = Token.first
     assert_not_nil token
     assert_equal user, token.user
@@ -73,6 +73,7 @@ class AccountTest < ActionController::IntegrationTest
     Redmine::Configuration.stubs(:[]).with('autologin_cookie_name').returns('custom_autologin')
     Redmine::Configuration.stubs(:[]).with('autologin_cookie_path').returns('/')
     Redmine::Configuration.stubs(:[]).with('autologin_cookie_secure').returns(false)
+    Redmine::Configuration.stubs(:[]).with('max_concurrent_ajax_uploads').returns(2)
 
     with_settings :autologin => '7' do
       assert_difference 'Token.count' do
@@ -85,12 +86,10 @@ class AccountTest < ActionController::IntegrationTest
       # Session is cleared
       reset!
       cookies['custom_autologin'] = token
-      get '/my/page'
+      get '/my/account'
       assert_response :success
 
-      assert_difference 'Token.count', -1 do
       post '/logout'
-      end
       assert cookies['custom_autologin'].blank?
     end
   end