Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

app/views/homework_attach/new.html.erb

@@ -78,7 +78,10 @@
                 </span>
                 &nbsp;&nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：&nbsp;
               </label>
-              <%= f.text_area "description", :class => "w620", :style=>"width:432px;", :maxlength => 3000, :placeholder => "最多3000个汉字", :onkeyup => "regexDescription();"%>
+              <%= f.text_area "description", :class => "w620", :maxlength => 3000, :style => "width:430px", :placeholder => "最多3000个汉字", :onkeyup => "regexDescription();"%>
+              <br />
+              <span id="homework_attach_description_span" style="padding-left: 100px;"></span>
+            </p>
             <br/>  <span id="homework_attach_description_span" style="padding-left: 100px;"></span>
             </p>
             <div class="cl"></div>

public/stylesheets/scm.css

@@ -97,8 +97,10 @@ table.annotate td.author {
     background: inherit;
 }
 
+
 table.annotate td.line-code { background-color: #fafafa; word-break: break-all;}
 
+
 div.action_M { background: #fd8 }
 div.action_D { background: #f88 }
 div.action_A { background: #bfb }

test/fixtures/activities.yml

@@ -1,6 +1,16 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
 one:
+
+  act_id: 
+  act_type: MyString
+  user_id: 
+
+two:
+  act_id: 
+  act_type: MyString
+  user_id: 
+
   id: 1
   act_id: 1
   act_type: JournalsForMessage
@@ -10,3 +20,4 @@ two:
   act_id: 2
   act_type: JournalsForMessage
   user_id: 5
+

test/fixtures/course_infos.yml

@@ -1,5 +1,14 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
+<<<<<<< HEAD
+one:
+  typeId: 1
+  typeName: MyString
+
+two:
+  typeId: 1
+  typeName: MyString
+=======
 courses_001_infos:
   id: 1
   course_id: 1
@@ -13,3 +22,4 @@ courses_002_infos:
   created_at: 2013-09-30 15:36:00
   updated_at: 2014-04-19 01:50:41
 
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0

test/fixtures/course_statuses.yml

@@ -1,10 +1,24 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+<<<<<<< HEAD
+
+one:
+=======
 courses_001_statuses:
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0
   changesets_count: 1
   watchers_count: 1
   course_id: 1
   grade: 1.5
   course_ac_para: 1
+<<<<<<< HEAD
+
+two:
+  changesets_count: 1
+  watchers_count: 1
+  course_id: 1
+  grade: 1.5
+  course_ac_para: 1
+=======
   created_at: 2013-09-30 15:36:00
   updated_at: 2014-04-19 01:50:41
 
@@ -16,3 +30,4 @@ courses_002_statuses:
   course_ac_para: 1
   created_at: 2013-09-30 15:36:00
   updated_at: 2014-04-19 01:50:41
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0

test/fixtures/schools.yml

@@ -1,5 +1,14 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
+<<<<<<< HEAD
+one:
+  name: 
+  province: MyString
+
+two:
+  name: 
+  province: MyString
+=======
 school_117:
   id: 117
   name: 国防科学技术大学
@@ -11,3 +20,4 @@ school_001:
   name: 摧毁地球人学校
   province: 火星
   logo_link: 
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0

test/fixtures/user_extensions.yml

@@ -1,3 +1,44 @@
+<<<<<<< HEAD
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+person_one_extra:
+  id: 44
+  user_id: 29
+  birthday: "2013-09-30 21:19:25"
+  brief_introduction: nil
+  gender: 1
+  location: "江苏"
+  occupation: ""
+  work_experience: nil
+  zip_code: nil
+  created_at: "2013-09-30 21:19:25"
+  updated_at: "2013-10-09 19:00:06"
+  technical_title: nil
+  identity: 2
+  student_id: nil
+  teacher_realname: nil
+  student_realname: nil
+  location_city: "南京"
+
+person_mao_extra:
+  id: 22
+  user_id: 193
+  birthday: "2013-09-30 21:19:25"
+  brief_introduction: "期待..."
+  gender: 0
+  location: "湖南长沙"
+  occupation: "国防科技大学计算机学院"
+  work_experience: nil
+  zip_code: nil
+  created_at: "2013-09-30 21:19:25"
+  updated_at: "2013-10-09 19:00:06"
+  technical_title: "教授"
+  identity: 0
+  student_id: nil
+  teacher_realname: nil
+  student_realname: nil
+  location_city: nil
+=======
 user_extension_006:
   id: 6
   user_id: 6
@@ -55,3 +96,4 @@ user_extension_025:
   student_realname: 'ue_realname'
   location_city: 哈尔滨
   school_id: 117
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0

test/functional/applied_project_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class AppliedProjectControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/functional/apply_project_masters_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class ApplyProjectMastersControllerTest < ActionController::TestCase
+  setup do
+    @apply_project_master = apply_project_masters(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:apply_project_masters)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create apply_project_master" do
+    assert_difference('ApplyProjectMaster.count') do
+      post :create, apply_project_master: {  }
+    end
+
+    assert_redirected_to apply_project_master_path(assigns(:apply_project_master))
+  end
+
+  test "should show apply_project_master" do
+    get :show, id: @apply_project_master
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @apply_project_master
+    assert_response :success
+  end
+
+  test "should update apply_project_master" do
+    put :update, id: @apply_project_master, apply_project_master: {  }
+    assert_redirected_to apply_project_master_path(assigns(:apply_project_master))
+  end
+
+  test "should destroy apply_project_master" do
+    assert_difference('ApplyProjectMaster.count', -1) do
+      delete :destroy, id: @apply_project_master
+    end
+
+    assert_redirected_to apply_project_masters_path
+  end
+end

test/functional/attachment_type_edit_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class AttachmentTypeEditControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/functional/contestnotifications_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class ContestnotificationsControllerTest < ActionController::TestCase
+  setup do
+    @contestnotification = contestnotifications(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:contestnotifications)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create contestnotification" do
+    assert_difference('Contestnotification.count') do
+      post :create, contestnotification: { author_id: @contestnotification.author_id, comments_count: @contestnotification.comments_count, contest_id: @contestnotification.contest_id, description: @contestnotification.description, summary: @contestnotification.summary, title: @contestnotification.title }
+    end
+
+    assert_redirected_to contestnotification_path(assigns(:contestnotification))
+  end
+
+  test "should show contestnotification" do
+    get :show, id: @contestnotification
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @contestnotification
+    assert_response :success
+  end
+
+  test "should update contestnotification" do
+    put :update, id: @contestnotification, contestnotification: { author_id: @contestnotification.author_id, comments_count: @contestnotification.comments_count, contest_id: @contestnotification.contest_id, description: @contestnotification.description, summary: @contestnotification.summary, title: @contestnotification.title }
+    assert_redirected_to contestnotification_path(assigns(:contestnotification))
+  end
+
+  test "should destroy contestnotification" do
+    assert_difference('Contestnotification.count', -1) do
+      delete :destroy, id: @contestnotification
+    end
+
+    assert_redirected_to contestnotifications_path
+  end
+end

test/functional/forums_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class ForumsControllerTest < ActionController::TestCase
+  setup do
+    @forum = forums(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:forums)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create forum" do
+    assert_difference('Forum.count') do
+      post :create, forum: {  }
+    end
+
+    assert_redirected_to forum_path(assigns(:forum))
+  end
+
+  test "should show forum" do
+    get :show, id: @forum
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @forum
+    assert_response :success
+  end
+
+  test "should update forum" do
+    put :update, id: @forum, forum: {  }
+    assert_redirected_to forum_path(assigns(:forum))
+  end
+
+  test "should destroy forum" do
+    assert_difference('Forum.count', -1) do
+      delete :destroy, id: @forum
+    end
+
+    assert_redirected_to forums_path
+  end
+end

test/functional/memos_controller_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class MemosControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+  def test_memo_create_fail
+  	memo = Memo.create(:subject => nil)
+  	assert true
+  end
+end

test/functional/no_uses_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class NoUsesControllerTest < ActionController::TestCase
+  setup do
+    @no_use = no_uses(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:no_uses)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create no_use" do
+    assert_difference('NoUse.count') do
+      post :create, no_use: {  }
+    end
+
+    assert_redirected_to no_use_path(assigns(:no_use))
+  end
+
+  test "should show no_use" do
+    get :show, id: @no_use
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @no_use
+    assert_response :success
+  end
+
+  test "should update no_use" do
+    put :update, id: @no_use, no_use: {  }
+    assert_redirected_to no_use_path(assigns(:no_use))
+  end
+
+  test "should destroy no_use" do
+    assert_difference('NoUse.count', -1) do
+      delete :destroy, id: @no_use
+    end
+
+    assert_redirected_to no_uses_path
+  end
+end

test/functional/notificationcomments_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class NotificationcommentsControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/functional/open_source_projects_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class OpenSourceProjectsControllerTest < ActionController::TestCase
+  setup do
+    @open_source_project = open_source_projects(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:open_source_projects)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create open_source_project" do
+    assert_difference('OpenSourceProject.count') do
+      post :create, open_source_project: { String: @open_source_project.String }
+    end
+
+    assert_redirected_to open_source_project_path(assigns(:open_source_project))
+  end
+
+  test "should show open_source_project" do
+    get :show, id: @open_source_project
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @open_source_project
+    assert_response :success
+  end
+
+  test "should update open_source_project" do
+    put :update, id: @open_source_project, open_source_project: { String: @open_source_project.String }
+    assert_redirected_to open_source_project_path(assigns(:open_source_project))
+  end
+
+  test "should destroy open_source_project" do
+    assert_difference('OpenSourceProject.count', -1) do
+      delete :destroy, id: @open_source_project
+    end
+
+    assert_redirected_to open_source_projects_path
+  end
+end

test/functional/softapplications_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class SoftapplicationsControllerTest < ActionController::TestCase
+  setup do
+    @softapplication = softapplications(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:softapplications)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create softapplication" do
+    assert_difference('Softapplication.count') do
+      post :create, softapplication: { android_min_version_available: @softapplication.android_min_version_available, app_type_id: @softapplication.app_type_id, app_type_name: @softapplication.app_type_name, description: @softapplication.description, name: @softapplication.name, user_id: @softapplication.user_id }
+    end
+
+    assert_redirected_to softapplication_path(assigns(:softapplication))
+  end
+
+  test "should show softapplication" do
+    get :show, id: @softapplication
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @softapplication
+    assert_response :success
+  end
+
+  test "should update softapplication" do
+    put :update, id: @softapplication, softapplication: { android_min_version_available: @softapplication.android_min_version_available, app_type_id: @softapplication.app_type_id, app_type_name: @softapplication.app_type_name, description: @softapplication.description, name: @softapplication.name, user_id: @softapplication.user_id }
+    assert_redirected_to softapplication_path(assigns(:softapplication))
+  end
+
+  test "should destroy softapplication" do
+    assert_difference('Softapplication.count', -1) do
+      delete :destroy, id: @softapplication
+    end
+
+    assert_redirected_to softapplications_path
+  end
+end

test/functional/test_controller_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class TestControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+  test "get test index error" do
+  	@request.env["REQUEST_URI"] = ""
+  	get :index
+  	assert_template :index
+  	# assert_template layout: "layouts/base", partial: ["layouts/base_header","_base_header", 'layouts/base_footer', "_base_footer",]
+  end
+end

test/functional/web_footer_companies_controller_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
+<<<<<<< HEAD:test/unit/relative_memo_to_open_source_project_test.rb
+class RelativeMemoToOpenSourceProjectTest < ActiveSupport::TestCase
+=======
 class WebFooterCompaniesControllerTest < ActionController::TestCase
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0:test/functional/web_footer_companies_controller_test.rb
   # test "the truth" do
   #   assert true
   # end

test/unit/attachmentstype_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class AttachmentstypeTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/contest_notification_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
+<<<<<<< HEAD:test/unit/applied_project_test.rb
+class AppliedProjectTest < ActiveSupport::TestCase
+=======
 class ContestNotificationTest < ActiveSupport::TestCase
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0:test/unit/contest_notification_test.rb
   # test "the truth" do
   #   assert true
   # end

test/unit/contesting_softapplication_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ContestingSoftapplicationTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/contestnotification_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ContestnotificationTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/course_group_test.rb

@@ -1,3 +1,12 @@
+<<<<<<< HEAD:test/unit/bug_to_osp_test.rb
+require 'test_helper'
+
+class BugToOspTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
+=======
 require 'test_helper'
 
 class CourseGroupTest < ActiveSupport::TestCase
@@ -5,3 +14,4 @@ class CourseGroupTest < ActiveSupport::TestCase
   #   assert true
   # end
 end
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0:test/unit/course_group_test.rb

test/unit/course_infos_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CourseInfosTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/course_status_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CourseStatusTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/forum_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ForumTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/helpers/applied_project_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class AppliedProjectHelperTest < ActionView::TestCase
+end

test/unit/helpers/apply_project_masters_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class ApplyProjectMastersHelperTest < ActionView::TestCase
+end

test/unit/helpers/attachment_type_edit_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class AttachmentTypeEditHelperTest < ActionView::TestCase
+end

test/unit/helpers/contestnotifications_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class ContestnotificationsHelperTest < ActionView::TestCase
+end

test/unit/helpers/courses_helper_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path('../../../test_helper', __FILE__)
+
+class CoursesHelperTest < ActionView::TestCase
+	include CoursesHelper
+	# test "test truth" do
+	# 	@project = Project.find_by_id 6834
+	# 	teacherNum = teacherCount @project
+	# 	studentNum = studentCount @project
+	# 	assert_equal 1, teacherNum
+	# 	assert_equal 5, studentNum
+	# end
+end

test/unit/helpers/forums_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class ForumsHelperTest < ActionView::TestCase
+end

test/unit/helpers/memos_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class MemosHelperTest < ActionView::TestCase
+end

test/unit/helpers/no_uses_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class NoUsesHelperTest < ActionView::TestCase
+end

test/unit/helpers/notificationcomments_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class NotificationcommentsHelperTest < ActionView::TestCase
+end

test/unit/helpers/open_source_projects_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class OpenSourceProjectsHelperTest < ActionView::TestCase
+end

test/unit/helpers/school_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class SchoolHelperTest < ActionView::TestCase
+end

test/unit/helpers/softapplications_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class SoftapplicationsHelperTest < ActionView::TestCase
+end

test/unit/helpers/stores_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class StoresHelperTest < ActionView::TestCase
+end

test/unit/helpers/test_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class TestHelperTest < ActionView::TestCase
+end

test/unit/helpers/zipdown_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class ZipdownHelperTest < ActionView::TestCase
+end

test/unit/join_in_contest_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class JoinInContestTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/journal_reply_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class JournalReplyTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/memo_test.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+require 'test_helper'
+
+class MemoTest < ActiveSupport::TestCase
+  test "the truth" do
+    assert true
+  end
+
+  def test_the_truth
+  	assert true
+  end
+
+  test "should not save memo without content" do
+  	memo = Memo.new
+  	assert !memo.save, "assert, save memo without content."
+  end
+end

test/unit/no_use_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class NoUseTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/notificationcomments_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class NotificationcommentsTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/open_source_project_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class OpenSourceProjectTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/option_number_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
+<<<<<<< HEAD:test/functional/school_controller_test.rb
+class SchoolControllerTest < ActionController::TestCase
+=======
 class OptionNumberTest < ActiveSupport::TestCase
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0:test/unit/option_number_test.rb
   # test "the truth" do
   #   assert true
   # end

test/unit/project_score_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
+<<<<<<< HEAD:test/unit/apply_project_master_test.rb
+class ApplyProjectMasterTest < ActiveSupport::TestCase
+=======
 class ProjectScoreTest < ActiveSupport::TestCase
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0:test/unit/project_score_test.rb
   # test "the truth" do
   #   assert true
   # end

test/unit/relative_memo_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class RelativeMemoTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/school_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SchoolTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/softapplication_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SoftapplicationTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/user_score_details_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserScoreDetailsTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/unit/web_footer_company_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
+<<<<<<< HEAD:test/functional/user_score_controller_test.rb
+class UserScoreControllerTest < ActionController::TestCase
+=======
 class WebFooterCompanyTest < ActiveSupport::TestCase
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0:test/unit/web_footer_company_test.rb
   # test "the truth" do
   #   assert true
   # end

test/unit/web_footer_oranizer_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
+<<<<<<< HEAD:test/functional/zipdown_controller_test.rb
+class ZipdownControllerTest < ActionController::TestCase
+=======
 class WebFooterOranizerTest < ActiveSupport::TestCase
+>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0:test/unit/web_footer_oranizer_test.rb
   # test "the truth" do
   #   assert true
   # end