Skip to content

Commit

Permalink
Modify tests to now include Adam Chapman, Duke of Surrey (#944)
Browse files Browse the repository at this point in the history
  • Loading branch information
David Paul Belanger committed May 21, 2019
1 parent fb40bc6 commit 4b2e74f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions wheels/tests/model/associations/hasMany.cfc
Expand Up @@ -207,12 +207,12 @@ component extends="wheels.tests.Test" {

function test_calculated_property_without_distinct() {
authors = model("author").findAll(select="id, firstName, lastName, numberofitems");
assert('authors.recordCount IS 7');
assert('authors.recordCount IS 8');
}

function test_select_aggregate_calculated_property_with_distinct() {
authors = model("author").findAll(select="id, firstName, lastName, numberofitems", distinct=true);
assert('authors.recordCount IS 7');
assert('authors.recordCount IS 8');
}

function test_aggregate_calculated_property_with_distinct() {
Expand All @@ -227,7 +227,7 @@ component extends="wheels.tests.Test" {

function test_calculated_properties_with_included_model_with_distinct() {
authors = model("author").findAll(select="id, firstName, lastName, numberofitems, titlealias", include="posts", distinct=true);
assert('authors.recordCount IS 10');
assert('authors.recordCount IS 11');
}

}
4 changes: 2 additions & 2 deletions wheels/tests/model/calculations/count.cfc
Expand Up @@ -2,7 +2,7 @@ component extends="wheels.tests.Test" {

function test_count() {
result = model("author").count();
assert("result IS 7");
assert("result IS 8");
}

function test_count_with_group() {
Expand All @@ -16,7 +16,7 @@ component extends="wheels.tests.Test" {

function test_count_with_include() {
result = model("author").count(include="posts");
assert("result IS 7");
assert("result IS 8");
}

function test_count_with_where() {
Expand Down
2 changes: 1 addition & 1 deletion wheels/tests/model/delete/delete.cfc
Expand Up @@ -7,7 +7,7 @@ component extends="wheels.tests.Test" {
allAuthors = model("author").findAll();
transaction action="rollback";
}
assert("allAuthors.recordcount eq 6");
assert("allAuthors.recordcount eq 7");
}

function test_soft_delete() {
Expand Down
2 changes: 1 addition & 1 deletion wheels/tests/model/delete/deletebykey.cfc
Expand Up @@ -7,7 +7,7 @@ component extends="wheels.tests.Test" {
allAuthors = model("author").findAll();
transaction action="rollback";
}
assert("allAuthors.recordcount eq 6");
assert("allAuthors.recordcount eq 7");
}

function test_soft_delete_by_key() {
Expand Down
2 changes: 1 addition & 1 deletion wheels/tests/model/delete/deleteone.cfc
Expand Up @@ -18,7 +18,7 @@ component extends="wheels.tests.Test" {
allAuthors = model("author").findAll();
transaction action="rollback";
}
assert("allAuthors.recordcount eq 6");
assert("allAuthors.recordcount eq 7");
}

function test_soft_delete_one() {
Expand Down

0 comments on commit 4b2e74f

Please sign in to comment.