<%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
@@ -39,7 +39,7 @@
<%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
<%= h(topic.subject) %>
<% if topic.editable_by?(User.current) %>
-
<%= l(:button_edit) %>
+
<%= l(:button_edit) %>
<% end %>
<%= link_to(
l(:button_delete),
@@ -164,17 +164,34 @@
KindEditor.ready(function(K){
$("div[nhname='container_board']").each(function(){
var container = $(this);
+ var about_talk = $("div[nhname='about_talk']",container);
nh_init_board({
kindutil:K,
showbtn:$("a[nhname='showbtn']",container),
- about_talk:$("div[nhname='about_talk']",container),
- inputsubject:$("input[nhname='inputsubject']",container),
- subjectmsg:$("p[nhname='subjectmsg']",container),
- textarea:$("textarea[nhname='textarea']",container),
- contentmsg:$("p[nhname='contentmsg']",container),
- submitbtn:$("a[nhname='submitbtn']",container),
- cancelbtn:$("a[nhname='cancelbtn']",container),
- form:$("form[nhname='form']",container)
+ about_talk:about_talk,
+ inputsubject:$("input[nhname='inputsubject']",about_talk),
+ subjectmsg:$("p[nhname='subjectmsg']",about_talk),
+ textarea:$("textarea[nhname='textarea']",about_talk),
+ contentmsg:$("p[nhname='contentmsg']",about_talk),
+ submitbtn:$("a[nhname='submitbtn']",about_talk),
+ cancelbtn:$("a[nhname='cancelbtn']",about_talk),
+ form:$("form[nhname='form']",about_talk)
+ });
+ });
+ $("div[ecname='container_board_reply']").each(function(){
+ var container = $(this);
+ var about_talk = $("div[nhname='about_talk_reply']",container);
+ nh_init_board({
+ kindutil:K,
+ showbtn:$("a[nhname='showbtn_reply']",container),
+ about_talk:about_talk,
+ inputsubject:$("input[nhname='inputsubject']",about_talk),
+ subjectmsg:$("p[nhname='subjectmsg']",about_talk),
+ textarea:$("textarea[nhname='textarea']",about_talk),
+ contentmsg:$("p[nhname='contentmsg']",about_talk),
+ submitbtn:$("a[nhname='submitbtn']",about_talk),
+ cancelbtn:$("a[nhname='cancelbtn']",about_talk),
+ form:$("form[nhname='form']",about_talk)
});
});
});
From 9e4f303742fd6b7ba252c99bd55e84d9dfd12f8d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 23 May 2015 17:18:13 +0800
Subject: [PATCH 10/48] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/avatar_controller.rb | 62 ++++++++++++++++------------
1 file changed, 35 insertions(+), 27 deletions(-)
diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb
index b6efaef0c..afd206c92 100644
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@@ -29,43 +29,51 @@ class AvatarController < ApplicationController
end
if @temp_file && (@temp_file.size > 0)
- diskfile=disk_filename(@source_type,@source_id)
- @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
+ if @temp_file.size > Setting.upload_avatar_max_size.to_i
+ @status = 1
+ @msg = l(:error_upload_avatar_to_large, :max_size => number_to_human_size(Setting.upload_avatar_max_size.to_i))
+ elsif Trustie::Utils::Image.new(@temp_file.tempfile.path).image?
+ diskfile=disk_filename(@source_type,@source_id)
+ @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
- # 用户头像上传时进行特别处理
- if @source_type == 'User'
- diskfile += "temp"
- @urlfile += "temp"
- end
+ # 用户头像上传时进行特别处理
+ if @source_type == 'User'
+ diskfile += "temp"
+ @urlfile += "temp"
+ end
- logger.info("Saving avatar '#{diskfile}' (#{@temp_file.size} bytes)")
- path = File.dirname(diskfile)
- unless File.directory?(path)
- FileUtils.mkdir_p(path)
- end
- md5 = Digest::MD5.new
- File.open(diskfile, "wb") do |f|
- if @temp_file.respond_to?(:read)
- buffer = ""
- while (buffer = @temp_file.read(8192))
- f.write(buffer)
- md5.update(buffer)
+ logger.info("Saving avatar '#{diskfile}' (#{@temp_file.size} bytes)")
+ path = File.dirname(diskfile)
+ unless File.directory?(path)
+ FileUtils.mkdir_p(path)
+ end
+ md5 = Digest::MD5.new
+ File.open(diskfile, "wb") do |f|
+ if @temp_file.respond_to?(:read)
+ buffer = ""
+ while (buffer = @temp_file.read(8192))
+ f.write(buffer)
+ md5.update(buffer)
+ end
+ else
+ f.write(@temp_file)
+ md5.update(@temp_file)
end
- else
- f.write(@temp_file)
- md5.update(@temp_file)
end
+
+ Trustie::Utils::Image.new(diskfile,true).compress(300)
+ @status = 0
+ @msg = ''
+ else
+ @status = 2
+ @msg = l(:not_valid_image_file)
end
-# self.digest = md5.hexdigest
end
@temp_file = nil
- image = Trustie::Utils::Image.new(diskfile,true)
- image.compress(300)
-
respond_to do |format|
format.json{
- render :inline => "#{@urlfile.to_s}?#{Time.now.to_i}",:content_type => 'text/html'
+ render :inline => {status: @status, message:@msg, url:"#{@urlfile.to_s}?#{Time.now.to_i}"}.to_json,:content_type => 'text/html'
return
}
format.js
From 69affa8a2ecdc914e32a215f362e67f3f8bb0541 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 25 May 2015 15:19:42 +0800
Subject: [PATCH 11/48] ...
---
app/views/boards/_form_project.html.erb | 6 +-
app/views/boards/_project_new_topic.html.erb | 2 +-
app/views/boards/_project_show.html.erb | 165 +++++++++++--------
3 files changed, 98 insertions(+), 75 deletions(-)
diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index 5cf20a993..58bb5501c 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -81,7 +81,11 @@
<% end %>
-
+ <% if replying%>
+
+ <% else %>
+
+ <%end %>
diff --git a/app/views/boards/_project_new_topic.html.erb b/app/views/boards/_project_new_topic.html.erb
index 05304e978..d7c8972fc 100644
--- a/app/views/boards/_project_new_topic.html.erb
+++ b/app/views/boards/_project_new_topic.html.erb
@@ -1,4 +1,4 @@
-<%= form_for @message, :url =>{:controller=>'messages',:action => 'new', :board_id => @board.id, :is_board => 'true'},:nhname=>'form', :html => {:multipart => true, :id => 'message-form', :name=>'message-form'} do |f| %>
+<%= form_for @message, :url =>{:controller=>'messages',:action => 'new', :board_id => @board.id, :is_board => 'true'},:html => {:nhname=>'form', :multipart => true, :id => 'message-form', :name=>'message-form'} do |f| %>
<%= render :partial => 'form_project', :locals => {:f => f, :topic => @message} %>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index ae8dd5ed2..dc1cff634 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -31,72 +31,73 @@
讨论区共有<%= @topic_count %>个帖子
<% if @topics.any? %>
<% @topics.each do |topic| %>
-
-
- <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
-
- <% author = topic.author.to_s + "：" %>
- <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
-
<%= h(topic.subject) %>
- <% if topic.editable_by?(User.current) %>
-
<%= l(:button_edit) %>
- <% end %>
- <%= link_to(
- l(:button_delete),
- {:controller =>'messages',:action => 'destroy', :id => topic.id, :board_id => topic.board_id, :is_board=>'true'},
- :method => :post,
- :data => {:confirm => l(:text_are_you_sure)},
- :class => 'talk_edit fr',
- :style => ' margin-right: 10px;'
- ) if topic.destroyable_by?(User.current) %>
- <% if topic.sticky? %>
-
<%= l(:label_board_sticky)%>
- <% end %>
-
-
-
- <%= topic.content.html_safe %>
-
-
-
- [展开]
-
- 
-
-
- <%= link_to_attachments_course topic, :author => false %>
- <%= l(:label_activity_time)%>： <%= format_time topic.created_on %>
-
- <% if User.current.logged? %>
- <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => "about_newtalk#{topic.id}",:class => ' c_dblue fr' %>
- <% end %>
-
-
-
-
- <%= render :partial => 'edit',locals: {:topic => topic} %>
-
-
-
-
- <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
- <% if !topic.locked? && authorize_for('messages', 'reply') %>
-
-
-
- <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'},
- :html => {:nhname=>"form",:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
- <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-
<%= l(:button_cancel)%>
-
<%= l(:label_memo_create)%>
- <% end %>
-
-
- <% end %>
-
+ <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
+
+ <% author = topic.author.to_s + "：" %>
+ <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
+
<%= h(topic.subject) %>
+
+ <% if topic.editable_by?(User.current) %>
+
<%= l(:button_edit) %>
+ <% end %>
+ <%= link_to(
+ l(:button_delete),
+ {:controller =>'messages',:action => 'destroy', :id => topic.id, :board_id => topic.board_id, :is_board=>'true'},
+ :method => :post,
+ :data => {:confirm => l(:text_are_you_sure)},
+ :class => 'talk_edit fr',
+ :style => ' margin-right: 10px;'
+ ) if topic.destroyable_by?(User.current) %>
+ <% if topic.sticky? %>
+
<%= l(:label_board_sticky)%>
+ <% end %>
+
+
+
+
+ <%= topic.content.html_safe %>
+
+
+
+ [展开]
+
+
+
+
+ <%= link_to_attachments_course topic, :author => false %>
+ <%= l(:label_activity_time)%>： <%= format_time topic.created_on %>
+
+ <% if User.current.logged? %>
+
<%= l(:button_reply) %>
+ <% end %>
+
+
+
+ <%= render :partial => 'edit',locals: {:topic => topic} %>
+
+
+
+
+ <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
+ <% if !topic.locked? && authorize_for('messages', 'reply') %>
+
+
+
+ <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'},
+ :html => {:nhname=>"form",:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
+ <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+
+ <% end %>
+
+
+ <% end %>
+
+
+
@@ -130,7 +131,8 @@
function nh_init_board(params){
params.showbtn.click(function(){//发帖/编辑/回复按钮的click
if(params.textarea.data('init') == undefined){
- var editor = params.kindutil.create(params.textarea, {//初始化编辑器
+ //初始化编辑器
+ var editor = params.kindutil.create(params.textarea, {
resizeType : 1,
allowPreviewEmoticons : false,
allowImageUpload : false,
@@ -138,7 +140,8 @@
width:"565px",
items : []
});
- params.submitbtn.click(function(){//提交按钮click
+ //表单提交
+ params.form.submit(function(){
var is_checked = nh_check_field({
subject:params.inputsubject,
subjectmsg:params.subjectmsg,
@@ -148,14 +151,29 @@
if(is_checked){
alert('submit');
params.textarea.html(editor.html());
-// params.form.submit();
+ return false;
+// return true;
}
+ return false;
});
- params.cancelbtn.click(function(){//取消按钮click
+ //提交按钮click
+ params.submitbtn.click(function(){
+ params.form.submit();
+ });
+ //取消按钮click
+ params.cancelbtn.click(function(){
params.about_talk.toggle();//显示/隐藏编辑区
- params.inputsubject.focus();
+ if(params.about_talk.is(':hidden')){//隐藏时reset表单数据
+ params.form[0].reset();
+ editor.html(params.textarea.html());
+ params.subjectmsg.hide();
+ params.contentmsg.hide();
+ }else{
+ if(params.type=='reply'){editor.focus();}//有bug 页面不跟着跳
+ else params.inputsubject.focus();
+ }
});
- params.textarea.data('init','1')
+ params.textarea.data('init','1');//标记为已经初始化
}
params.cancelbtn.click();//显示/隐藏编辑区
});
@@ -178,10 +196,11 @@
form:$("form[nhname='form']",about_talk)
});
});
- $("div[ecname='container_board_reply']").each(function(){
+ $("div[mhname='container_board_reply']").each(function(){
var container = $(this);
var about_talk = $("div[nhname='about_talk_reply']",container);
nh_init_board({
+ type:'reply',
kindutil:K,
showbtn:$("a[nhname='showbtn_reply']",container),
about_talk:about_talk,
From a27b3e9dc667a3384f4b9f58537938d29cc31452 Mon Sep 17 00:00:00 2001
From: alanlong9278 <547533434@qq.com>
Date: Mon, 25 May 2015 23:22:11 +0800
Subject: [PATCH 12/48] Signed-off-by: alanlong9278 <547533434@qq.com>
---
db/schema.rb | 7 -
test/test_helper.rb | 1042 +++++++++++++++++++++----------------------
2 files changed, 521 insertions(+), 528 deletions(-)
diff --git a/db/schema.rb b/db/schema.rb
index de6655544..f8d638a5f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -438,13 +438,6 @@ ActiveRecord::Schema.define(:version => 20150514133640) do
add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
- create_table "discuss_demos", :force => true do |t|
- t.string "title"
- t.text "body"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- end
-
create_table "documents", :force => true do |t|
t.integer "project_id", :default => 0, :null => false
t.integer "category_id", :default => 0, :null => false
diff --git a/test/test_helper.rb b/test/test_helper.rb
index b7d786704..4e75da59b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,521 +1,521 @@
-require 'rubygems'
-# require 'spork'
-#uncomment the following line to use spork with the debugger
-#require 'spork/ext/ruby-debug'
-
-# 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.
-# ENV["RAILS_ENV"] = "test"
-# require File.expand_path('../../config/environment', __FILE__)
-# require 'rails/test_help'
-#
-# end
-#
-# Spork.each_run do
-# # This code will be run each time you run your specs.
-#
-# end
-
-# --- Instructions ---
-# Sort the contents of this file into a Spork.prefork and a Spork.each_run
-# block.
-#
-# The Spork.prefork block is run only once when the spork server is started.
-# You typically want to place most of your (slow) initializer code in here, in
-# particular, require'ing any 3rd-party gems that you don't normally modify
-# during development.
-#
-# The Spork.each_run block is run each time you run your specs. In case you
-# need to load files that tend to change during development, require them here.
-# With Rails, your application modules are loaded automatically, so sometimes
-# this block can remain empty.
-#
-# Note: You can modify files loaded *from* the Spork.each_run block without
-# restarting the spork server. However, this file itself will not be reloaded,
-# so if you change any of the code inside the each_run block, you still need to
-# restart the server. In general, if you have non-trivial code in this file,
-# it's advisable to move it into a separate file so you can easily edit it
-# without restarting spork. (For example, with RSpec, you could move
-# non-trivial code into a file spec/support/my_helper.rb, making sure that the
-# spec/support/* files are require'd from inside the each_run block.)
-#
-# Any code that is left outside the two blocks will be run during preforking
-# *and* during each_run -- that's probably not what you want.
-#
-# These instructions should self-destruct in 10 seconds. If they don't, feel
-# free to delete them.
-
-
-
-
-# Redmine - project management software
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-#require 'shoulda'
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'rails/test_help'
-require Rails.root.join('test', 'mocks', 'open_id_authentication_mock.rb').to_s
-
-require File.expand_path(File.dirname(__FILE__) + '/object_helpers')
-include ObjectHelpers
-
-class ActiveSupport::TestCase
- include ActionDispatch::TestProcess
-
- self.use_transactional_fixtures = true
- self.use_instantiated_fixtures = false
-
- def log_user(login, password)
- User.anonymous
- get "/login"
- assert_equal nil, session[:user_id]
- puts response.response_code()
- assert_response :success
- assert_template "account/login"
- post "/login", :username => login, :password => password
- assert_equal login, User.find(session[:user_id]).login
- end
-
- def uploaded_test_file(name, mime)
- fixture_file_upload("files/#{name}", mime, true)
- end
-
- def credentials(user, password=nil)
- {'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user)}
- end
-
- # Mock out a file
- def self.mock_file
- file = 'a_file.png'
- file.stubs(:size).returns(32)
- file.stubs(:original_filename).returns('a_file.png')
- file.stubs(:content_type).returns('image/png')
- file.stubs(:read).returns(false)
- file
- end
-
- def mock_file
- self.class.mock_file
- end
-
- def mock_file_with_options(options={})
- file = ''
- file.stubs(:size).returns(32)
- original_filename = options[:original_filename] || nil
- file.stubs(:original_filename).returns(original_filename)
- content_type = options[:content_type] || nil
- file.stubs(:content_type).returns(content_type)
- file.stubs(:read).returns(false)
- file
- end
-
- # Use a temporary directory for attachment related tests
- def set_tmp_attachments_directory
- Dir.mkdir "#{Rails.root}/tmp/test" unless File.directory?("#{Rails.root}/tmp/test")
- unless File.directory?("#{Rails.root}/tmp/test/attachments")
- Dir.mkdir "#{Rails.root}/tmp/test/attachments"
- end
- Attachment.storage_path = "#{Rails.root}/tmp/test/attachments"
- end
-
- def set_fixtures_attachments_directory
- Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
- end
-
- def with_settings(options, &block)
- saved_settings = options.keys.inject({}) do |h, k|
- h[k] = case Setting[k]
- when Symbol, false, true, nil
- Setting[k]
- else
- Setting[k].dup
- end
- h
- end
- options.each {|k, v| Setting[k] = v}
- yield
- ensure
- saved_settings.each {|k, v| Setting[k] = v} if saved_settings
- end
-
- # Yields the block with user as the current user
- def with_current_user(user, &block)
- saved_user = User.current
- User.current = user
- yield
- ensure
- User.current = saved_user
- end
-
- def change_user_password(login, new_password)
- user = User.first(:conditions => {:login => login})
- user.password, user.password_confirmation = new_password, new_password
- user.save!
- end
-
- def self.ldap_configured?
- @test_ldap = Net::LDAP.new(:host => '127.0.0.1', :port => 389)
- return @test_ldap.bind
- rescue Exception => e
- # LDAP is not listening
- return nil
- end
-
- def self.convert_installed?
- Redmine::Thumbnail.convert_available?
- end
-
- # Returns the path to the test +vendor+ repository
- def self.repository_path(vendor)
- Rails.root.join("tmp/test/#{vendor.downcase}_repository").to_s
- end
-
- # Returns the url of the subversion test repository
- def self.subversion_repository_url
- path = repository_path('subversion')
- path = '/' + path unless path.starts_with?('/')
- "file://#{path}"
- end
-
- # Returns true if the +vendor+ test repository is configured
- def self.repository_configured?(vendor)
- File.directory?(repository_path(vendor))
- end
-
- def repository_path_hash(arr)
- hs = {}
- hs[:path] = arr.join("/")
- hs[:param] = arr.join("/")
- hs
- end
-
- def assert_save(object)
- saved = object.save
- message = "#{object.class} could not be saved"
- errors = object.errors.full_messages.map {|m| "- #{m}"}
- message << ":\n#{errors.join("\n")}" if errors.any?
- assert_equal true, saved, message
- end
-
- def assert_error_tag(options={})
- assert_tag({:attributes => { :id => 'errorExplanation' }}.merge(options))
- end
-
- def assert_include(expected, s, message=nil)
- assert s.include?(expected), (message || "\"#{expected}\" not found in \"#{s}\"")
- end
-
- def assert_not_include(expected, s)
- assert !s.include?(expected), "\"#{expected}\" found in \"#{s}\""
- end
-
- def assert_select_in(text, *args, &block)
- d = HTML::Document.new(CGI::unescapeHTML(String.new(text))).root
- assert_select(d, *args, &block)
- end
-
- def assert_mail_body_match(expected, mail)
- if expected.is_a?(String)
- assert_include expected, mail_body(mail)
- else
- assert_match expected, mail_body(mail)
- end
- end
-
- def assert_mail_body_no_match(expected, mail)
- if expected.is_a?(String)
- assert_not_include expected, mail_body(mail)
- else
- assert_no_match expected, mail_body(mail)
- end
- end
-
- def mail_body(mail)
- mail.parts.first.body.encoded
- end
-end
-
-module Redmine
- module ApiTest
- # Base class for API tests
- class Base < ActionDispatch::IntegrationTest
- # Test that a request allows the three types of API authentication
- #
- # * HTTP Basic with username and password
- # * HTTP Basic with an api key for the username
- # * Key based with the key=X parameter
- #
- # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
- # @param [String] url the request url
- # @param [optional, Hash] parameters additional request parameters
- # @param [optional, Hash] options additional options
- # @option options [Symbol] :success_code Successful response code (:success)
- # @option options [Symbol] :failure_code Failure response code (:unauthorized)
- def self.should_allow_api_authentication(http_method, url, parameters={}, options={})
- should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters, options)
- should_allow_http_basic_auth_with_key(http_method, url, parameters, options)
- should_allow_key_based_auth(http_method, url, parameters, options)
- end
-
- # Test that a request allows the username and password for HTTP BASIC
- #
- # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
- # @param [String] url the request url
- # @param [optional, Hash] parameters additional request parameters
- # @param [optional, Hash] options additional options
- # @option options [Symbol] :success_code Successful response code (:success)
- # @option options [Symbol] :failure_code Failure response code (:unauthorized)
- def self.should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters={}, options={})
- success_code = options[:success_code] || :success
- failure_code = options[:failure_code] || :unauthorized
-
- context "should allow http basic auth using a username and password for #{http_method} #{url}" do
- context "with a valid HTTP authentication" do
- setup do
- @user = User.generate! do |user|
- user.admin = true
- user.password = 'my_password'
- end
- send(http_method, url, parameters, credentials(@user.login, 'my_password'))
- end
-
- should_respond_with success_code
- should_respond_with_content_type_based_on_url(url)
- should "login as the user" do
- assert_equal @user, User.current
- end
- end
-
- context "with an invalid HTTP authentication" do
- setup do
- @user = User.generate!
- send(http_method, url, parameters, credentials(@user.login, 'wrong_password'))
- end
-
- should_respond_with failure_code
- should_respond_with_content_type_based_on_url(url)
- should "not login as the user" do
- assert_equal User.anonymous, User.current
- end
- end
-
- context "without credentials" do
- setup do
- send(http_method, url, parameters)
- end
-
- should_respond_with failure_code
- should_respond_with_content_type_based_on_url(url)
- should "include_www_authenticate_header" do
- assert @controller.response.headers.has_key?('WWW-Authenticate')
- end
- end
- end
- end
-
- # Test that a request allows the API key with HTTP BASIC
- #
- # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
- # @param [String] url the request url
- # @param [optional, Hash] parameters additional request parameters
- # @param [optional, Hash] options additional options
- # @option options [Symbol] :success_code Successful response code (:success)
- # @option options [Symbol] :failure_code Failure response code (:unauthorized)
- def self.should_allow_http_basic_auth_with_key(http_method, url, parameters={}, options={})
- success_code = options[:success_code] || :success
- failure_code = options[:failure_code] || :unauthorized
-
- context "should allow http basic auth with a key for #{http_method} #{url}" do
- context "with a valid HTTP authentication using the API token" do
- setup do
- @user = User.generate! do |user|
- user.admin = true
- end
- @token = Token.create!(:user => @user, :action => 'api')
- send(http_method, url, parameters, credentials(@token.value, 'X'))
- end
- should_respond_with success_code
- should_respond_with_content_type_based_on_url(url)
- should_be_a_valid_response_string_based_on_url(url)
- should "login as the user" do
- assert_equal @user, User.current
- end
- end
-
- context "with an invalid HTTP authentication" do
- setup do
- @user = User.generate!
- @token = Token.create!(:user => @user, :action => 'feeds')
- send(http_method, url, parameters, credentials(@token.value, 'X'))
- end
- should_respond_with failure_code
- should_respond_with_content_type_based_on_url(url)
- should "not login as the user" do
- assert_equal User.anonymous, User.current
- end
- end
- end
- end
-
- # Test that a request allows full key authentication
- #
- # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
- # @param [String] url the request url, without the key=ZXY parameter
- # @param [optional, Hash] parameters additional request parameters
- # @param [optional, Hash] options additional options
- # @option options [Symbol] :success_code Successful response code (:success)
- # @option options [Symbol] :failure_code Failure response code (:unauthorized)
- def self.should_allow_key_based_auth(http_method, url, parameters={}, options={})
- success_code = options[:success_code] || :success
- failure_code = options[:failure_code] || :unauthorized
-
- context "should allow key based auth using key=X for #{http_method} #{url}" do
- context "with a valid api token" do
- setup do
- @user = User.generate! do |user|
- user.admin = true
- end
- @token = Token.create!(:user => @user, :action => 'api')
- # Simple url parse to add on ?key= or &key=
- request_url = if url.match(/\?/)
- url + "&key=#{@token.value}"
- else
- url + "?key=#{@token.value}"
- end
- send(http_method, request_url, parameters)
- end
- should_respond_with success_code
- should_respond_with_content_type_based_on_url(url)
- should_be_a_valid_response_string_based_on_url(url)
- should "login as the user" do
- assert_equal @user, User.current
- end
- end
-
- context "with an invalid api token" do
- setup do
- @user = User.generate! do |user|
- user.admin = true
- end
- @token = Token.create!(:user => @user, :action => 'feeds')
- # Simple url parse to add on ?key= or &key=
- request_url = if url.match(/\?/)
- url + "&key=#{@token.value}"
- else
- url + "?key=#{@token.value}"
- end
- send(http_method, request_url, parameters)
- end
- should_respond_with failure_code
- should_respond_with_content_type_based_on_url(url)
- should "not login as the user" do
- assert_equal User.anonymous, User.current
- end
- end
- end
-
- context "should allow key based auth using X-Redmine-API-Key header for #{http_method} #{url}" do
- setup do
- @user = User.generate! do |user|
- user.admin = true
- end
- @token = Token.create!(:user => @user, :action => 'api')
- send(http_method, url, parameters, {'X-Redmine-API-Key' => @token.value.to_s})
- end
- should_respond_with success_code
- should_respond_with_content_type_based_on_url(url)
- should_be_a_valid_response_string_based_on_url(url)
- should "login as the user" do
- assert_equal @user, User.current
- end
- end
- end
-
- # Uses should_respond_with_content_type based on what's in the url:
- #
- # '/project/issues.xml' => should_respond_with_content_type :xml
- # '/project/issues.json' => should_respond_with_content_type :json
- #
- # @param [String] url Request
- def self.should_respond_with_content_type_based_on_url(url)
- case
- when url.match(/xml/i)
- should "respond with XML" do
- assert_equal 'application/xml', @response.content_type
- end
- when url.match(/json/i)
- should "respond with JSON" do
- assert_equal 'application/json', @response.content_type
- end
- else
- raise "Unknown content type for should_respond_with_content_type_based_on_url: #{url}"
- end
- end
-
- # Uses the url to assert which format the response should be in
- #
- # '/project/issues.xml' => should_be_a_valid_xml_string
- # '/project/issues.json' => should_be_a_valid_json_string
- #
- # @param [String] url Request
- def self.should_be_a_valid_response_string_based_on_url(url)
- case
- when url.match(/xml/i)
- should_be_a_valid_xml_string
- when url.match(/json/i)
- should_be_a_valid_json_string
- else
- raise "Unknown content type for should_be_a_valid_response_based_on_url: #{url}"
- end
- end
-
- # Checks that the response is a valid JSON string
- def self.should_be_a_valid_json_string
- should "be a valid JSON string (or empty)" do
- assert(response.body.blank? || ActiveSupport::JSON.decode(response.body))
- end
- end
-
- # Checks that the response is a valid XML string
- def self.should_be_a_valid_xml_string
- should "be a valid XML string" do
- assert REXML::Document.new(response.body)
- end
- end
-
- def self.should_respond_with(status)
- should "respond with #{status}" do
- assert_response status
- end
- end
- end
- end
-end
-
-# URL helpers do not work with config.threadsafe!
-# https://github.com/rspec/rspec-rails/issues/476#issuecomment-4705454
-ActionView::TestCase::TestController.instance_eval do
- helper Rails.application.routes.url_helpers
-end
-ActionView::TestCase::TestController.class_eval do
- def _routes
- Rails.application.routes
- end
-end
+require 'rubygems'
+# require 'spork'
+#uncomment the following line to use spork with the debugger
+#require 'spork/ext/ruby-debug'
+
+# 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.
+# ENV["RAILS_ENV"] = "test"
+# require File.expand_path('../../config/environment', __FILE__)
+# require 'rails/test_help'
+#
+# end
+#
+# Spork.each_run do
+# # This code will be run each time you run your specs.
+#
+# end
+
+# --- Instructions ---
+# Sort the contents of this file into a Spork.prefork and a Spork.each_run
+# block.
+#
+# The Spork.prefork block is run only once when the spork server is started.
+# You typically want to place most of your (slow) initializer code in here, in
+# particular, require'ing any 3rd-party gems that you don't normally modify
+# during development.
+#
+# The Spork.each_run block is run each time you run your specs. In case you
+# need to load files that tend to change during development, require them here.
+# With Rails, your application modules are loaded automatically, so sometimes
+# this block can remain empty.
+#
+# Note: You can modify files loaded *from* the Spork.each_run block without
+# restarting the spork server. However, this file itself will not be reloaded,
+# so if you change any of the code inside the each_run block, you still need to
+# restart the server. In general, if you have non-trivial code in this file,
+# it's advisable to move it into a separate file so you can easily edit it
+# without restarting spork. (For example, with RSpec, you could move
+# non-trivial code into a file spec/support/my_helper.rb, making sure that the
+# spec/support/* files are require'd from inside the each_run block.)
+#
+# Any code that is left outside the two blocks will be run during preforking
+# *and* during each_run -- that's probably not what you want.
+#
+# These instructions should self-destruct in 10 seconds. If they don't, feel
+# free to delete them.
+
+
+
+
+# Redmine - project management software
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+#require 'shoulda'
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'rails/test_help'
+require Rails.root.join('test', 'mocks', 'open_id_authentication_mock.rb').to_s
+
+require File.expand_path(File.dirname(__FILE__) + '/object_helpers')
+include ObjectHelpers
+
+class ActiveSupport::TestCase
+ include ActionDispatch::TestProcess
+
+ self.use_transactional_fixtures = true
+ self.use_instantiated_fixtures = false
+
+ def log_user(login, password)
+ User.anonymous
+ get "/login"
+ assert_equal nil, session[:user_id]
+ puts response.response_code()
+ assert_response :success
+ assert_template "account/login"
+ post "/login", :username => login, :password => password
+ assert_equal login, User.find(session[:user_id]).login
+ end
+
+ def uploaded_test_file(name, mime)
+ fixture_file_upload("files/#{name}", mime, true)
+ end
+
+ def credentials(user, password=nil)
+ {'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user)}
+ end
+
+ # Mock out a file
+ def self.mock_file
+ file = 'a_file.png'
+ file.stubs(:size).returns(32)
+ file.stubs(:original_filename).returns('a_file.png')
+ file.stubs(:content_type).returns('image/png')
+ file.stubs(:read).returns(false)
+ file
+ end
+
+ def mock_file
+ self.class.mock_file
+ end
+
+ def mock_file_with_options(options={})
+ file = ''
+ file.stubs(:size).returns(32)
+ original_filename = options[:original_filename] || nil
+ file.stubs(:original_filename).returns(original_filename)
+ content_type = options[:content_type] || nil
+ file.stubs(:content_type).returns(content_type)
+ file.stubs(:read).returns(false)
+ file
+ end
+
+ # Use a temporary directory for attachment related tests
+ def set_tmp_attachments_directory
+ Dir.mkdir "#{Rails.root}/tmp/test" unless File.directory?("#{Rails.root}/tmp/test")
+ unless File.directory?("#{Rails.root}/tmp/test/attachments")
+ Dir.mkdir "#{Rails.root}/tmp/test/attachments"
+ end
+ Attachment.storage_path = "#{Rails.root}/tmp/test/attachments"
+ end
+
+ def set_fixtures_attachments_directory
+ Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
+ end
+
+ def with_settings(options, &block)
+ saved_settings = options.keys.inject({}) do |h, k|
+ h[k] = case Setting[k]
+ when Symbol, false, true, nil
+ Setting[k]
+ else
+ Setting[k].dup
+ end
+ h
+ end
+ options.each {|k, v| Setting[k] = v}
+ yield
+ ensure
+ saved_settings.each {|k, v| Setting[k] = v} if saved_settings
+ end
+
+ # Yields the block with user as the current user
+ def with_current_user(user, &block)
+ saved_user = User.current
+ User.current = user
+ yield
+ ensure
+ User.current = saved_user
+ end
+
+ def change_user_password(login, new_password)
+ user = User.first(:conditions => {:login => login})
+ user.password, user.password_confirmation = new_password, new_password
+ user.save!
+ end
+
+ def self.ldap_configured?
+ @test_ldap = Net::LDAP.new(:host => '127.0.0.1', :port => 389)
+ return @test_ldap.bind
+ rescue Exception => e
+ # LDAP is not listening
+ return nil
+ end
+
+ def self.convert_installed?
+ Redmine::Thumbnail.convert_available?
+ end
+
+ # Returns the path to the test +vendor+ repository
+ def self.repository_path(vendor)
+ Rails.root.join("tmp/test/#{vendor.downcase}_repository").to_s
+ end
+
+ # Returns the url of the subversion test repository
+ def self.subversion_repository_url
+ path = repository_path('subversion')
+ path = '/' + path unless path.starts_with?('/')
+ "file://#{path}"
+ end
+
+ # Returns true if the +vendor+ test repository is configured
+ def self.repository_configured?(vendor)
+ File.directory?(repository_path(vendor))
+ end
+
+ def repository_path_hash(arr)
+ hs = {}
+ hs[:path] = arr.join("/")
+ hs[:param] = arr.join("/")
+ hs
+ end
+
+ def assert_save(object)
+ saved = object.save
+ message = "#{object.class} could not be saved"
+ errors = object.errors.full_messages.map {|m| "- #{m}"}
+ message << ":\n#{errors.join("\n")}" if errors.any?
+ assert_equal true, saved, message
+ end
+
+ def assert_error_tag(options={})
+ assert_tag({:attributes => { :id => 'errorExplanation' }}.merge(options))
+ end
+
+ def assert_include(expected, s, message=nil)
+ assert s.include?(expected), (message || "\"#{expected}\" not found in \"#{s}\"")
+ end
+
+ def assert_not_include(expected, s)
+ assert !s.include?(expected), "\"#{expected}\" found in \"#{s}\""
+ end
+
+ def assert_select_in(text, *args, &block)
+ d = HTML::Document.new(CGI::unescapeHTML(String.new(text))).root
+ assert_select(d, *args, &block)
+ end
+
+ def assert_mail_body_match(expected, mail)
+ if expected.is_a?(String)
+ assert_include expected, mail_body(mail)
+ else
+ assert_match expected, mail_body(mail)
+ end
+ end
+
+ def assert_mail_body_no_match(expected, mail)
+ if expected.is_a?(String)
+ assert_not_include expected, mail_body(mail)
+ else
+ assert_no_match expected, mail_body(mail)
+ end
+ end
+
+ def mail_body(mail)
+ mail.parts.first.body.encoded
+ end
+end
+
+module Redmine
+ module ApiTest
+ # Base class for API tests
+ class Base < ActionDispatch::IntegrationTest
+ # Test that a request allows the three types of API authentication
+ #
+ # * HTTP Basic with username and password
+ # * HTTP Basic with an api key for the username
+ # * Key based with the key=X parameter
+ #
+ # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
+ # @param [String] url the request url
+ # @param [optional, Hash] parameters additional request parameters
+ # @param [optional, Hash] options additional options
+ # @option options [Symbol] :success_code Successful response code (:success)
+ # @option options [Symbol] :failure_code Failure response code (:unauthorized)
+ def self.should_allow_api_authentication(http_method, url, parameters={}, options={})
+ should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters, options)
+ should_allow_http_basic_auth_with_key(http_method, url, parameters, options)
+ should_allow_key_based_auth(http_method, url, parameters, options)
+ end
+
+ # Test that a request allows the username and password for HTTP BASIC
+ #
+ # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
+ # @param [String] url the request url
+ # @param [optional, Hash] parameters additional request parameters
+ # @param [optional, Hash] options additional options
+ # @option options [Symbol] :success_code Successful response code (:success)
+ # @option options [Symbol] :failure_code Failure response code (:unauthorized)
+ def self.should_allow_http_basic_auth_with_username_and_password(http_method, url, parameters={}, options={})
+ success_code = options[:success_code] || :success
+ failure_code = options[:failure_code] || :unauthorized
+
+ context "should allow http basic auth using a username and password for #{http_method} #{url}" do
+ context "with a valid HTTP authentication" do
+ setup do
+ @user = User.generate! do |user|
+ user.admin = true
+ user.password = 'my_password'
+ end
+ send(http_method, url, parameters, credentials(@user.login, 'my_password'))
+ end
+
+ should_respond_with success_code
+ should_respond_with_content_type_based_on_url(url)
+ should "login as the user" do
+ assert_equal @user, User.current
+ end
+ end
+
+ context "with an invalid HTTP authentication" do
+ setup do
+ @user = User.generate!
+ send(http_method, url, parameters, credentials(@user.login, 'wrong_password'))
+ end
+
+ should_respond_with failure_code
+ should_respond_with_content_type_based_on_url(url)
+ should "not login as the user" do
+ assert_equal User.anonymous, User.current
+ end
+ end
+
+ context "without credentials" do
+ setup do
+ send(http_method, url, parameters)
+ end
+
+ should_respond_with failure_code
+ should_respond_with_content_type_based_on_url(url)
+ should "include_www_authenticate_header" do
+ assert @controller.response.headers.has_key?('WWW-Authenticate')
+ end
+ end
+ end
+ end
+
+ # Test that a request allows the API key with HTTP BASIC
+ #
+ # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
+ # @param [String] url the request url
+ # @param [optional, Hash] parameters additional request parameters
+ # @param [optional, Hash] options additional options
+ # @option options [Symbol] :success_code Successful response code (:success)
+ # @option options [Symbol] :failure_code Failure response code (:unauthorized)
+ def self.should_allow_http_basic_auth_with_key(http_method, url, parameters={}, options={})
+ success_code = options[:success_code] || :success
+ failure_code = options[:failure_code] || :unauthorized
+
+ context "should allow http basic auth with a key for #{http_method} #{url}" do
+ context "with a valid HTTP authentication using the API token" do
+ setup do
+ @user = User.generate! do |user|
+ user.admin = true
+ end
+ @token = Token.create!(:user => @user, :action => 'api')
+ send(http_method, url, parameters, credentials(@token.value, 'X'))
+ end
+ should_respond_with success_code
+ should_respond_with_content_type_based_on_url(url)
+ should_be_a_valid_response_string_based_on_url(url)
+ should "login as the user" do
+ assert_equal @user, User.current
+ end
+ end
+
+ context "with an invalid HTTP authentication" do
+ setup do
+ @user = User.generate!
+ @token = Token.create!(:user => @user, :action => 'feeds')
+ send(http_method, url, parameters, credentials(@token.value, 'X'))
+ end
+ should_respond_with failure_code
+ should_respond_with_content_type_based_on_url(url)
+ should "not login as the user" do
+ assert_equal User.anonymous, User.current
+ end
+ end
+ end
+ end
+
+ # Test that a request allows full key authentication
+ #
+ # @param [Symbol] http_method the HTTP method for request (:get, :post, :put, :delete)
+ # @param [String] url the request url, without the key=ZXY parameter
+ # @param [optional, Hash] parameters additional request parameters
+ # @param [optional, Hash] options additional options
+ # @option options [Symbol] :success_code Successful response code (:success)
+ # @option options [Symbol] :failure_code Failure response code (:unauthorized)
+ def self.should_allow_key_based_auth(http_method, url, parameters={}, options={})
+ success_code = options[:success_code] || :success
+ failure_code = options[:failure_code] || :unauthorized
+
+ context "should allow key based auth using key=X for #{http_method} #{url}" do
+ context "with a valid api token" do
+ setup do
+ @user = User.generate! do |user|
+ user.admin = true
+ end
+ @token = Token.create!(:user => @user, :action => 'api')
+ # Simple url parse to add on ?key= or &key=
+ request_url = if url.match(/\?/)
+ url + "&key=#{@token.value}"
+ else
+ url + "?key=#{@token.value}"
+ end
+ send(http_method, request_url, parameters)
+ end
+ should_respond_with success_code
+ should_respond_with_content_type_based_on_url(url)
+ should_be_a_valid_response_string_based_on_url(url)
+ should "login as the user" do
+ assert_equal @user, User.current
+ end
+ end
+
+ context "with an invalid api token" do
+ setup do
+ @user = User.generate! do |user|
+ user.admin = true
+ end
+ @token = Token.create!(:user => @user, :action => 'feeds')
+ # Simple url parse to add on ?key= or &key=
+ request_url = if url.match(/\?/)
+ url + "&key=#{@token.value}"
+ else
+ url + "?key=#{@token.value}"
+ end
+ send(http_method, request_url, parameters)
+ end
+ should_respond_with failure_code
+ should_respond_with_content_type_based_on_url(url)
+ should "not login as the user" do
+ assert_equal User.anonymous, User.current
+ end
+ end
+ end
+
+ context "should allow key based auth using X-Redmine-API-Key header for #{http_method} #{url}" do
+ setup do
+ @user = User.generate! do |user|
+ user.admin = true
+ end
+ @token = Token.create!(:user => @user, :action => 'api')
+ send(http_method, url, parameters, {'X-Redmine-API-Key' => @token.value.to_s})
+ end
+ should_respond_with success_code
+ should_respond_with_content_type_based_on_url(url)
+ should_be_a_valid_response_string_based_on_url(url)
+ should "login as the user" do
+ assert_equal @user, User.current
+ end
+ end
+ end
+
+ # Uses should_respond_with_content_type based on what's in the url:
+ #
+ # '/project/issues.xml' => should_respond_with_content_type :xml
+ # '/project/issues.json' => should_respond_with_content_type :json
+ #
+ # @param [String] url Request
+ def self.should_respond_with_content_type_based_on_url(url)
+ case
+ when url.match(/xml/i)
+ should "respond with XML" do
+ assert_equal 'application/xml', @response.content_type
+ end
+ when url.match(/json/i)
+ should "respond with JSON" do
+ assert_equal 'application/json', @response.content_type
+ end
+ else
+ raise "Unknown content type for should_respond_with_content_type_based_on_url: #{url}"
+ end
+ end
+
+ # Uses the url to assert which format the response should be in
+ #
+ # '/project/issues.xml' => should_be_a_valid_xml_string
+ # '/project/issues.json' => should_be_a_valid_json_string
+ #
+ # @param [String] url Request
+ def self.should_be_a_valid_response_string_based_on_url(url)
+ case
+ when url.match(/xml/i)
+ should_be_a_valid_xml_string
+ when url.match(/json/i)
+ should_be_a_valid_json_string
+ else
+ raise "Unknown content type for should_be_a_valid_response_based_on_url: #{url}"
+ end
+ end
+
+ # Checks that the response is a valid JSON string
+ def self.should_be_a_valid_json_string
+ should "be a valid JSON string (or empty)" do
+ assert(response.body.blank? || ActiveSupport::JSON.decode(response.body))
+ end
+ end
+
+ # Checks that the response is a valid XML string
+ def self.should_be_a_valid_xml_string
+ should "be a valid XML string" do
+ assert REXML::Document.new(response.body)
+ end
+ end
+
+ def self.should_respond_with(status)
+ should "respond with #{status}" do
+ assert_response status
+ end
+ end
+ end
+ end
+end
+
+# URL helpers do not work with config.threadsafe!
+# https://github.com/rspec/rspec-rails/issues/476#issuecomment-4705454
+ActionView::TestCase::TestController.instance_eval do
+ helper Rails.application.routes.url_helpers
+end
+ActionView::TestCase::TestController.class_eval do
+ def _routes
+ Rails.application.routes
+ end
+end
From b1a60d31182fc72c19bfaf173de7b686695c9760 Mon Sep 17 00:00:00 2001
From: alanlong9278 <547533434@qq.com>
Date: Tue, 26 May 2015 00:01:15 +0800
Subject: [PATCH 13/48] Signed-off-by: alanlong9278 <547533434@qq.com>
---
.gitignore | 2 +-
config/additional_environment.rb | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 config/additional_environment.rb
diff --git a/.gitignore b/.gitignore
index ffa4a1bc7..5810401cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
*.swp
/config/database.yml
/config/configuration.yml
-/config/additional_environment.rb
+
/files/*
/log/*
/public/tmp/*
diff --git a/config/additional_environment.rb b/config/additional_environment.rb
new file mode 100644
index 000000000..5c73f6aab
--- /dev/null
+++ b/config/additional_environment.rb
@@ -0,0 +1,3 @@
+if Rails.env.production?
+ config.cache_store = :redis_store, 'redis://localhost:6379/0/cache', { expires_in: 90.minutes }
+end
\ No newline at end of file
From f52058aaf38fa3feb61c244bcaa6a45ee3306fa4 Mon Sep 17 00:00:00 2001
From: huang
Date: Tue, 26 May 2015 09:37:29 +0800
Subject: [PATCH 14/48] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E6=96=B0=E7=95=8C=E9=9D=A2=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90?=
=?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/welcome_controller.rb | 1 +
app/views/layouts/base.html.erb | 4 ++--
app/views/layouts/base_welcome.html.erb | 23 ++++++++---------------
app/views/welcome/index.html.erb | 4 ++--
4 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 6e067fb83..787b1b050 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -16,6 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class WelcomeController < ApplicationController
+ layout "base_welcome"
include ApplicationHelper
include WelcomeHelper
helper :project_score
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 439c5f7b2..483cabac5 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -12,7 +12,7 @@
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "jquery.leanModal.min" %>
-<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
+<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
@@ -31,7 +31,7 @@
<%=render :partial => 'layouts/base_footer'%>