diff --git a/t/api-test.t b/t/api-test.t index 556b28a7..cef07698 100644 --- a/t/api-test.t +++ b/t/api-test.t @@ -51,45 +51,45 @@ sub request_json { } my $result = request_json({ uri => "/login", method => "POST", data => { username => "root", password => "wrong" } }); -ok($result->code() == 403, "Incorrect password rejected."); +is($result->code(), 403, "Incorrect password rejected."); my $result = request_json({ uri => "/login", method => "POST", data => { username => "root", password => "foobar" } }); my $user = decode_json($result->content()); -ok($user->{username} eq "root", "The root user is named root"); -ok($user->{userroles}->[0] eq "admin", "The root user is an admin"); +is($user->{username}, "root", "The root user is named root"); +is($user->{userroles}->[0], "admin", "The root user is an admin"); $cookie = $result->header("set-cookie"); $user = decode_json(request_json({ uri => "/current-user" })->content()); -ok($user->{username} eq "root", "The current user is named root"); -ok($user->{userroles}->[0] eq "admin", "The current user is an admin"); +is($user->{username}, "root", "The current user is named root"); +is($user->{userroles}->[0], "admin", "The current user is an admin"); -ok(request_json({ uri => '/project/sample' })->code() == 404, "Non-existent projects don't exist"); +is(request_json({ uri => '/project/sample' })->code(), 404, "Non-existent projects don't exist"); $result = request_json({ uri => '/project/sample', method => 'PUT', data => { displayname => "Sample", enabled => "1", visible => "1", } }); -ok($result->code() == 201, "PUTting a new project creates it"); +is($result->code(), 201, "PUTting a new project creates it"); my $project = decode_json(request_json({ uri => '/project/sample' })->content()); ok((not @{$project->{jobsets}}), "A new project has no jobsets"); $result = request_json({ uri => '/jobset/sample/default', method => 'PUT', data => { nixexprpath => "default.nix", nixexprinput => "my-src", inputs => { "my-src" => { type => "path", value => $jobsetdir } }, enabled => "1", visible => "1", checkinterval => "3600"} }); -ok($result->code() == 201, "PUTting a new jobset creates it"); +is($result->code(), 201, "PUTting a new jobset creates it"); my $jobset = decode_json(request_json({ uri => '/jobset/sample/default' })->content()); ok(exists $jobset->{jobsetinputs}->{"my-src"}, "The new jobset has a 'my-src' input"); -ok($jobset->{jobsetinputs}->{"my-src"}->{"jobsetinputalts"}->[0] eq $jobsetdir, "The 'my-src' input is in $jobsetdir"); +is($jobset->{jobsetinputs}->{"my-src"}->{"jobsetinputalts"}->[0], $jobsetdir, "The 'my-src' input is in $jobsetdir"); ok(evalSucceeds($db->resultset('Jobsets')->find({ name => 'default' })), "Evaluating should exit with return code 0"); $result = request_json({ uri => '/jobset/sample/default/evals' }); -ok($result->code() == 200, "Can get evals of a jobset"); +is($result->code(), 200, "Can get evals of a jobset"); my $evals = decode_json($result->content())->{evals}; my $eval = $evals->[0]; -ok($eval->{hasnewbuilds} == 1, "The first eval of a jobset has new builds"); +is($eval->{hasnewbuilds}, 1, "The first eval of a jobset has new builds"); open(my $fh, ">>", "${jobsetdir}/default.nix") or die "didn't open?"; @@ -98,19 +98,19 @@ close $fh; ok(evalSucceeds($db->resultset('Jobsets')->find({ name => 'default' })), "Evaluating should exit with return code 0"); my $evals = decode_json(request_json({ uri => '/jobset/sample/default/evals' })->content())->{evals}; -ok(scalar(@$evals) == 2, "Changing a jobset source creates the second evaluation"); -ok($evals->[0]->{jobsetevalinputs}->{"my-src"}->{revision} != $evals->[1]->{jobsetevalinputs}->{"my-src"}->{revision}, "Changing a jobset source changes its revision"); +is(scalar(@$evals), 2, "Changing a jobset source creates the second evaluation"); +isnt($evals->[0]->{jobsetevalinputs}->{"my-src"}->{revision}, $evals->[1]->{jobsetevalinputs}->{"my-src"}->{revision}, "Changing a jobset source changes its revision"); my $build = decode_json(request_json({ uri => "/build/" . $evals->[0]->{builds}->[0] })->content()); -ok($build->{job} eq "job", "The build's job name is job"); -ok($build->{finished} == 0, "The build isn't finished yet"); +is($build->{job}, "job", "The build's job name is job"); +is($build->{finished}, 0, "The build isn't finished yet"); ok($build->{buildoutputs}->{out}->{path} =~ /\/nix\/store\/[a-zA-Z0-9]{32}-job$/, "The build's outpath is in the Nix store and named 'job'"); my $search_project = decode_json(request_json({ uri => "/search/?query=sample" })->content()); -ok($search_project->{projects}[0]->{name} == "sample", "Search for project 'sample' works"); +is($search_project->{projects}[0]->{name}, "sample", "Search for project 'sample' works"); my $search_build = decode_json(request_json({ uri => "/search/?query=" . $build->{buildoutputs}->{out}->{path} })->content()); -ok($search_build->{builds}[0]->{buildoutputs}->{out}->{path} == $build->{buildoutputs}->{out}->{path}, "Search for builds work"); +is($search_build->{builds}[0]->{buildoutputs}->{out}->{path}, $build->{buildoutputs}->{out}->{path}, "Search for builds work"); done_testing; \ No newline at end of file