changed error message from elements to columns as discussed in tidyve…

…rse/dplyr#1101
tidyverse · Jul 16, 2015 · 7315728 · 7315728
1 parent bf8fae1
commit 7315728
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/dataframe.R b/R/dataframe.R
@@ -132,7 +132,7 @@ as_data_frame <- function(x) {
 
   names_x <- names2(x)
   if (any(is.na(names_x) | names_x == "")){
-    stop("All elements must be named", call. = FALSE)
+    stop("All columns must be named", call. = FALSE)
   }
 
   ok <- vapply(x, is_1d, logical(1))

diff --git a/tests/testthat/test-data_frame.R b/tests/testthat/test-data_frame.R
@@ -53,5 +53,5 @@ test_that("Zero column list makes 0 x 0 tbl_df", {
 test_that("error on NA column names (#1101)", {
   df <- data.frame( x = 1:10, y = 1:10 )
   names(df)[1] <- NA
-  expect_error( as_data_frame(df), "All elements must be named" )
+  expect_error( as_data_frame(df), "All columns must be named" )
 })