Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts: db/schema.rbGitlabVersion
commit
53ff6ea335
@ -0,0 +1,39 @@
|
|||||||
|
# More info at https://github.com/guard/guard#readme
|
||||||
|
|
||||||
|
# guard 'rails' do
|
||||||
|
# watch('Gemfile.lock')
|
||||||
|
# watch(%r{^(config|lib)/.*})
|
||||||
|
# end
|
||||||
|
#
|
||||||
|
guard 'spork', :test_unit => true, :test_unit_env => {'RAILS_ENV' => 'test'}, :wait => 60 do
|
||||||
|
watch('config/application.rb')
|
||||||
|
watch('config/environment.rb')
|
||||||
|
watch('config/environments/test.rb')
|
||||||
|
watch(%r{^config/initializers/.+\.rb$})
|
||||||
|
watch('Gemfile.lock')
|
||||||
|
watch('spec/spec_helper.rb') { :rspec }
|
||||||
|
watch('test/test_helper.rb') { :test_unit }
|
||||||
|
watch(%r{features/support/}) { :cucumber }
|
||||||
|
end
|
||||||
|
|
||||||
|
guard :test, :drb => true, :all_after_pass => false, :all_on_start => false do
|
||||||
|
watch(%r{^test/.+_test\.rb$})
|
||||||
|
watch('test/test_helper.rb') { 'test' }
|
||||||
|
|
||||||
|
# Non-rails
|
||||||
|
watch(%r{^lib/(.+)\.rb$}) { |m| "test/#{m[1]}_test.rb" }
|
||||||
|
|
||||||
|
# Rails 4
|
||||||
|
# watch(%r{^app/(.+)\.rb}) { |m| "test/#{m[1]}_test.rb" }
|
||||||
|
# watch(%r{^app/controllers/application_controller\.rb}) { 'test/controllers' }
|
||||||
|
# watch(%r{^app/controllers/(.+)_controller\.rb}) { |m| "test/integration/#{m[1]}_test.rb" }
|
||||||
|
# watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
|
||||||
|
# watch(%r{^lib/(.+)\.rb}) { |m| "test/lib/#{m[1]}_test.rb" }
|
||||||
|
|
||||||
|
# Rails < 4
|
||||||
|
watch(%r{^app/models/(.+)\.rb$}) { |m| "test/unit/#{m[1]}_test.rb" }
|
||||||
|
watch(%r{^app/controllers/(.+)\.rb$}) { |m| "test/functional/#{m[1]}_test.rb" }
|
||||||
|
watch(%r{^app/views/(.+)/.+\.erb$}) { |m| "test/functional/#{m[1]}_controller_test.rb" }
|
||||||
|
watch(%r{^app/views/.+$}) { 'test/integration' }
|
||||||
|
watch('app/controllers/application_controller.rb') { ['test/functional', 'test/integration'] }
|
||||||
|
end
|
@ -0,0 +1,5 @@
|
|||||||
|
class AddIsPublicToDocuments < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :documents, :is_public, :integer,:default => 1
|
||||||
|
end
|
||||||
|
end
|
Binary file not shown.
Binary file not shown.
@ -0,0 +1,96 @@
|
|||||||
|
# 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 File.expand_path('../../../test_helper', __FILE__)
|
||||||
|
|
||||||
|
class RoutingProjectsTest < ActionController::IntegrationTest
|
||||||
|
def test_courses
|
||||||
|
assert_routing(
|
||||||
|
{ :method => 'get', :path => "/courses" },
|
||||||
|
{ :controller => 'courses', :action => 'index' }
|
||||||
|
)
|
||||||
|
end
|
||||||
|
def test_courses_search
|
||||||
|
assert_routing(
|
||||||
|
"/courses/search",
|
||||||
|
{controller: 'courses', action: 'search'}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_courses_item
|
||||||
|
assert_routing(
|
||||||
|
'courses/233',
|
||||||
|
{controller: 'courses', action: 'show', id: '233'}
|
||||||
|
)
|
||||||
|
# id eq str
|
||||||
|
assert_routing(
|
||||||
|
'courses/timestypo',
|
||||||
|
{controller: 'courses', action: 'show', id: 'timestypo'}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_course_setting
|
||||||
|
assert_routing(
|
||||||
|
'courses/233/settings',
|
||||||
|
{controller: 'courses', action: 'settings', id: '233'}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_course_homework
|
||||||
|
assert_routing(
|
||||||
|
'courses/233/homework',
|
||||||
|
{controller: 'courses', action: 'homework', id: '233'}
|
||||||
|
)
|
||||||
|
assert_routing(
|
||||||
|
'courses/233/new_homework',
|
||||||
|
{controller: 'courses', action: 'new_homework', id: '233'}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_course_file
|
||||||
|
assert_routing(
|
||||||
|
'courses/233/file',
|
||||||
|
{controller: 'courses', action: 'file', id: '233'}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_course_feedback
|
||||||
|
assert_routing(
|
||||||
|
'courses/233/feedback',
|
||||||
|
{controller: 'courses', action: 'feedback', id: '233'}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_course_member
|
||||||
|
assert_routing(
|
||||||
|
'courses/233/member',
|
||||||
|
{controller: 'courses', action: 'member', id: '233'}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_course_finish_restart_course
|
||||||
|
assert_routing(
|
||||||
|
{path: 'courses/233/finishcourse', method: :post},
|
||||||
|
{controller: 'courses', action: 'finishcourse', id: '233'}
|
||||||
|
)
|
||||||
|
assert_routing(
|
||||||
|
{path: 'courses/233/restartcourse', method: :post},
|
||||||
|
{controller: 'courses', action: 'restartcourse', id: '233'}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
Loading…
Reference in new issue