Closes MarkUsProject#342

akrassikov · Feb 6, 2012 · 2a5bb3e · 2a5bb3e
1 parent e257ad7
commit 2a5bb3e
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 21 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -25,7 +25,7 @@ def default_url_options(options={})
   # Set version for MarkUs to be available in
   # any view
   def set_markus_version
-    version_file=File.expand_path(File.join(::Rails.root.to_s, "app/MARKUS_VERSION"))
+    version_file=File.expand_path(File.join(::Rails.root.to_s, "app", "MARKUS_VERSION"))
     if !File.exist?(version_file)
       @markus_version = "unknown"
       return

diff --git a/app/models/admin.rb b/app/models/admin.rb
@@ -1,5 +1,5 @@
 # we need repository permission constants
-require File.join(File.dirname(__FILE__),'/../../lib/repo/repository')
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'repo', 'repository')
 class Admin < User
   SESSION_TIMEOUT = USER_ADMIN_SESSION_TIMEOUT
 

diff --git a/app/models/ta.rb b/app/models/ta.rb
@@ -1,5 +1,5 @@
 # we need repository and permission constants
-require File.join(File.dirname(__FILE__),'/../../lib/repo/repository')
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'repo', 'repository')
 
 class Ta < User
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -2,7 +2,7 @@
 require 'digest' # required for {set,reset}_api_token
 require 'base64' # required for {set,reset}_api_token
 # required for repository actions
-require File.join(File.dirname(__FILE__),'/../../lib/repo/repository')
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'repo', 'repository')
 
 # We always assume the following fields exists:
 # => :user_name, :last_name, :first_name

diff --git a/db/populate/06_repos.rb b/db/populate/06_repos.rb
@@ -3,7 +3,7 @@
 groups = Group.all
 assignment = Assignment.find_by_short_identifier("A1")
 
-file_dir  = File.join(File.dirname(__FILE__), '/data')
+file_dir  = File.join(File.dirname(__FILE__), 'data')
 groups.each do |group|
   Dir.foreach(file_dir) do |filename|
     unless File.directory?(File.join(file_dir, filename))

diff --git a/lib/repo/test/memory_repository_test.rb b/lib/repo/test/memory_repository_test.rb
@@ -7,12 +7,12 @@
 
 class MemoryRepositoryTest < Test::Unit::TestCase
 
-  RESOURCE_DIR = File.expand_path(File.join(File.dirname(__FILE__),"/input_files"))
+  RESOURCE_DIR = File.expand_path(File.join(File.dirname(__FILE__), "input_files"))
   TEST_USER = "testuser"
   REPO_LOCATION = File.expand_path(File.join(File.dirname(__FILE__),'memory_repo1'))
   ANOTHER_REPO_LOCATION = File.expand_path(File.join(File.dirname(__FILE__),'memory_repo2'))
   # following constant not used as of now
-  TEST_REPO_CONTENT = File.expand_path(File.join(File.dirname(__FILE__),'/../memory_repository.yml'))
+  TEST_REPO_CONTENT = File.expand_path(File.join(File.dirname(__FILE__),'..', 'memory_repository.yml'))
 
   context "MemoryRepository class" do
 
@@ -508,7 +508,7 @@ def add_some_files_helper(repo, files)
 # MemoryRevision, an implementation of AbstractRevision
 class MemoryRevisionTest < Test::Unit::TestCase
 
-  RESOURCE_DIR = File.expand_path(File.join(File.dirname(__FILE__),"/input_files"))
+  RESOURCE_DIR = File.expand_path(File.join(File.dirname(__FILE__),"input_files"))
   TEST_USER = "testuser"
 
   context "A MemoryRevision object" do

diff --git a/lib/tasks/populate.rake b/lib/tasks/populate.rake
@@ -2,7 +2,7 @@ namespace :markus do
 
   desc "Print MarkUs version"
   task :version do
-    VERSION_FILE=File.expand_path(File.join(__FILE__, '../../../app/MARKUS_VERSION'))
+    VERSION_FILE=File.expand_path(File.join(__FILE__, '..', '..', '..', 'app', 'MARKUS_VERSION'))
     if !File.exist?(VERSION_FILE)
       $stderr.puts "Could not determine MarkUs version, please check your installation!"
       exit(1)
@@ -41,7 +41,7 @@ namespace :markus do
   # this task depends on :environment and :populate
   task(:add_students => [:environment, :"db:populate"]) do
     puts "Populate database with some additional students"
-    STUDENT_CSV = File.expand_path(File.join(__FILE__, '/../../../test/classlist-csvs/new_students.csv'))
+    STUDENT_CSV = File.expand_path(File.join(__FILE__, '..', '..', '..', 'test', 'classlist-csvs', 'new_students.csv'))
     if File.readable?(STUDENT_CSV)
       csv_students = File.new(STUDENT_CSV)
       User.upload_user_list(Student, csv_students.read)

diff --git a/test/functional/sections_controller_test.rb b/test/functional/sections_controller_test.rb
@@ -1,9 +1,9 @@
 # Using machinist
 
-require File.dirname(__FILE__) + '/authenticated_controller_test'
-require File.join(File.dirname(__FILE__),'/../test_helper')
-require File.join(File.dirname(__FILE__),'/../blueprints/blueprints')
-require File.join(File.dirname(__FILE__),'/../blueprints/helper')
+require File.join(File.dirname(__FILE__), 'authenticated_controller_test')
+require File.join(File.dirname(__FILE__),'..', 'test_helper')
+require File.join(File.dirname(__FILE__),'..', 'blueprints', 'blueprints')
+require File.join(File.dirname(__FILE__),'..', 'blueprints', 'helper')
 require 'shoulda'
 
 

diff --git a/test/unit/grade_entry_item_test.rb b/test/unit/grade_entry_item_test.rb
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require File.join(File.dirname(__FILE__), '/../blueprints/helper')
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.join(File.dirname(__FILE__), '..', 'blueprints', 'helper')
 require 'shoulda'
 
 # Tests for GradeEntryItems

diff --git a/test/unit/grade_entry_student_test.rb b/test/unit/grade_entry_student_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
 require 'shoulda'
 
 # Tests for GradeEntryStudents

diff --git a/test/unit/grouping_test.rb b/test/unit/grouping_test.rb
@@ -235,7 +235,7 @@ class GroupingTest < ActiveSupport::TestCase
         @grouping = Grouping.make(:assignment => @assignment)
         @grouping.group.access_repo do |repo|
           txn = repo.get_transaction("markus")
-          assignment_folder = File.join(@assignment.repository_folder, "/")
+          assignment_folder = File.join(@assignment.repository_folder, File::SEPARATOR)
           begin
             txn.add(File.join(assignment_folder,
                               "Shapes.java"),

diff --git a/test/unit/helpers/automated_tests_helper_test.rb b/test/unit/helpers/automated_tests_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 include AutomatedTestsHelper
 require 'shoulda'
 

diff --git a/test/unit/helpers/ensure_config_helper_test.rb b/test/unit/helpers/ensure_config_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 require 'shoulda'
 require 'fileutils'
 require 'mocha'

diff --git a/test/unit/helpers/pagination_helper_test.rb b/test/unit/helpers/pagination_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 require 'shoulda'
 require 'fileutils'
 require 'mocha'