Move carriage return test to version-file-read

test/version-file-read.bats

@@ -64,3 +64,9 @@ IN
   run rbenv-version-file-read my-version
   assert_success "1.8.7"
 }
+
+@test "ignores carriage returns" {
+  cat > my-version <<< $'1.9.3\r'
+  run rbenv-version-file-read my-version
+  assert_success "1.9.3"
+}

test/version.bats

@@ -30,13 +30,6 @@ setup() {
   assert_success "1.9.3 (set by ${PWD}/.ruby-version)"
 }
 
-@test "set by local file containing CR" {
-  create_version "1.9.3"
-  cat > ".ruby-version" <<< $'1.9.3\r'
-  run rbenv-version
-  assert_success "1.9.3 (set by ${PWD}/.ruby-version)"
-}
-
 @test "set by global file" {
   create_version "1.9.3"
   cat > "${RBENV_ROOT}/version" <<<"1.9.3"