Skip tests on windows & update version

Crunch-io · Jan 27, 2022 · 2e04df8 · 2e04df8
1 parent 467cc45
commit 2e04df8
Show file tree

Hide file tree

Showing 15 changed files with 6,521 additions and 6,487 deletions.
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -7,7 +7,7 @@ Description: The Crunch.io service <https://crunch.io/> provides a cloud-based
     datasets from within R. Importantly, this allows technical researchers to
     collaborate naturally with team members, managers, and clients who prefer a
     point-and-click interface.
-Version: 1.28.3
+Version: 1.29.0
 Authors@R: c(
     person("Greg", "Freedman Ellis", role = c("aut", "cre"), email = "greg@crunch.io"),
     person("Jonathan", "Keane", role="aut", email="jkeane@gmail.com"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# crunch 1.28.3
+# crunch 1.29.0
 * Authenticating with an API key is now the recommended way to use the R crunch package. See
   the `vignette("crunch")` or `?crunch-api-key` for more details. The `login()` authentication
   flow is deprecated and will be removed from an upcoming release.

diff --git a/tests/testthat/test-cube-bases.R b/tests/testthat/test-cube-bases.R
@@ -1,69 +1,73 @@
 context("'Base sizes' in cubes")
 
-all.dims <- list(
-    Admit = c("Admitted", "Rejected"),
-    Gender = c("Male", "Female")
-)
+# Skip tests on windows (because they're slow and CRAN complains)
+if (tolower(Sys.info()[["sysname"]]) != "windows") {
 
-cube <- loadCube("cubes/admit-by-gender-weighted.json")
-b <- cubify(
-    1198, 557,
-    1493, 1278,
-    dims = all.dims
-)
-test_that("'bases' can be accessed and all margins work", {
-    expect_identical(
-        round(cube),
-        cubify(
-            1170, 547,
-            1474, 1261,
-            dims = all.dims
-        )
+    all.dims <- list(
+        Admit = c("Admitted", "Rejected"),
+        Gender = c("Male", "Female")
     )
-    expect_identical(bases(cube, 0), b)
-    expect_identical(bases(cube, 1), margin.table(b, 1))
-    expect_identical(bases(cube, 2), margin.table(b, 2))
-    expect_identical(bases(cube), sum(b))
-})
-
-with_mock_crunch({
-    ds <- cachedLoadDataset("test ds")
-    m <- multitables(ds)[[1]]
-    with_POST("https://app.crunch.io/api/datasets/1/multitables/apidocs-tabbook/", {
-        book1 <- tabBook(m, data = ds, output_format = "json")
-    })
 
-    test_that("bases methods exist for TabBookResult and MultitableResult", {
+    cube <- loadCube("cubes/admit-by-gender-weighted.json")
+    b <- cubify(
+        1198, 557,
+        1493, 1278,
+        dims = all.dims
+    )
+    test_that("'bases' can be accessed and all margins work", {
         expect_identical(
-            bases(book1, 0)[[1]][[2]],
+            round(cube),
             cubify(
-                4, 0, 1,
-                0, 5, 3,
-                1, 3, 5,
-                dims = list(
-                    allpets = c("Cat", "Dog", "Bird"),
-                    allpets = c("Cat", "Dog", "Bird")
-                )
+                1170, 547,
+                1474, 1261,
+                dims = all.dims
             )
         )
-        expect_identical(
-            bases(book1)[[1]][[2]],
-            cubify(
-                17,
-                dims = list(
-                    allpets = c("Cat", "Dog", "Bird"),
-                    allpets = c("Cat", "Dog", "Bird")
+        expect_identical(bases(cube, 0), b)
+        expect_identical(bases(cube, 1), margin.table(b, 1))
+        expect_identical(bases(cube, 2), margin.table(b, 2))
+        expect_identical(bases(cube), sum(b))
+    })
+
+    with_mock_crunch({
+        ds <- cachedLoadDataset("test ds")
+        m <- multitables(ds)[[1]]
+        with_POST("https://app.crunch.io/api/datasets/1/multitables/apidocs-tabbook/", {
+            book1 <- tabBook(m, data = ds, output_format = "json")
+        })
+
+        test_that("bases methods exist for TabBookResult and MultitableResult", {
+            expect_identical(
+                bases(book1, 0)[[1]][[2]],
+                cubify(
+                    4, 0, 1,
+                    0, 5, 3,
+                    1, 3, 5,
+                    dims = list(
+                        allpets = c("Cat", "Dog", "Bird"),
+                        allpets = c("Cat", "Dog", "Bird")
+                    )
                 )
             )
-        )
-    })
+            expect_identical(
+                bases(book1)[[1]][[2]],
+                cubify(
+                    17,
+                    dims = list(
+                        allpets = c("Cat", "Dog", "Bird"),
+                        allpets = c("Cat", "Dog", "Bird")
+                    )
+                )
+            )
+        })
 
-    test_that("base for univariate stats", {
-        skip("Need to use `cube_valid_count` to calculate base size")
-        expect_equal(bases(crtabs(max(birthyr) ~ 1, data = ds)), 25)
-        expect_error(bases(crtabs(max(birthyr) ~ 1, data = ds), 1),
-            "Margin 1 exceeds Cube's number of dimensions (0)",
-            fixed = TRUE
-        )
+        test_that("base for univariate stats", {
+            skip("Need to use `cube_valid_count` to calculate base size")
+            expect_equal(bases(crtabs(max(birthyr) ~ 1, data = ds)), 25)
+            expect_error(bases(crtabs(max(birthyr) ~ 1, data = ds), 1),
+                         "Margin 1 exceeds Cube's number of dimensions (0)",
+                         fixed = TRUE
+            )
+        })
     })
-})
+}