|
<% if part["name"] == @fastest["name"] %>
diff --git a/test/controllers/reports_controller_test.rb b/test/controllers/reports_controller_test.rb
index 8f9b34c..ffb6f24 100644
--- a/test/controllers/reports_controller_test.rb
+++ b/test/controllers/reports_controller_test.rb
@@ -1,7 +1,7 @@
-require 'test_helper'
+require "test_helper"
class ReportsControllerTest < ActionController::TestCase
- test "validates the data json" do
+ test "errors if body is not json" do
data = "nope"
post :create, body: data
@@ -10,23 +10,20 @@ class ReportsControllerTest < ActionController::TestCase
end
test "validates the data json as valid benchmark data" do
- data = <<-DATA
-{
- "entries":
- [{
- "name": "test",
- "ips": 10.1,
- "central_tendency": 10.1,
- "error": 23666,
- "stddev": 0.3,
- "microseconds": 3322,
- "iterations": 221,
- "cycles": 16
- }]
-}
- DATA
+ data = {
+ entries: [{
+ name: "test",
+ ips: 10.1,
+ central_tendency: 10.1,
+ error: 23666,
+ stddev: 0.3,
+ microseconds: 3322,
+ iterations: 221,
+ cycles: 16
+ }]
+ }
- post :create, body: data
+ post :create, params: data, as: :json
assert_equal "200", @response.code
@@ -34,77 +31,71 @@ class ReportsControllerTest < ActionController::TestCase
report = Report.find_from_short_id rep["id"]
-raw = <<-DATA
- [{
- "name": "test",
- "ips": 10.1,
- "central_tendency": 10.1,
- "error": 23666,
- "stddev": 0.3,
- "microseconds": 3322,
- "iterations": 221,
- "cycles": 16
- }]
-DATA
-
- assert_equal JSON.parse(raw), report.data
+ raw = <<~DATA
+ [{
+ "name": "test",
+ "ips": 10.1,
+ "central_tendency": 10.1,
+ "error": 23666,
+ "stddev": 0.3,
+ "microseconds": 3322,
+ "iterations": 221,
+ "cycles": 16
+ }]
+ DATA
+
+ assert_equal JSON.parse(raw), report.entries
end
test "errors on unknown data keys" do
- data = <<-DATA
-{
- "entries":
- [{
- "name": "test",
- "ipx": 10.1,
- "stddev": 0.3,
- "microseconds": 3322,
- "iterations": 221,
- "cycles": 16
- }]
-}
- DATA
+ data = {
+ entries: [{
+ name: "test",
+ ipx: 10.1,
+ stddev: 0.3,
+ microseconds: 3322,
+ iterations: 221,
+ cycles: 16
+ }]
+ }
- post :create, body: data
+ post :create, params: data, as: :json
assert_equal "400", @response.code
end
test "errors out if there are keys missing" do
- data = <<-DATA
-{
- "entries":
- [{
- "name": "test"
- }]
-}
- DATA
+ data = {
+ entries: [{
+ name: "test"
+ }]
+ }
- post :create, body: data
+ post :create, params: data, as: :json
assert_equal "400", @response.code
end
test "environment variables are sent, processed, and saved" do
data = {
- "ruby" => "3.2.1",
- "os" => "Linux",
- "arch" => "x86_64",
- "entries" => [
+ ruby: "3.2.1",
+ os: "Linux",
+ arch: "x86_64",
+ entries: [
{
- "name" => "test",
- "ips" => 10.1,
- "central_tendency" => 10.1,
- "error" => 23666,
- "stddev" => 0.3,
- "microseconds" => 3322,
- "iterations" => 221,
- "cycles" => 16
+ name: "test",
+ ips: 10.1,
+ central_tendency: 10.1,
+ error: 23666,
+ stddev: 0.3,
+ microseconds: 3322,
+ iterations: 221,
+ cycles: 16
}
]
}
- post :create, body: data.to_json
+ post :create, params: data, as: :json
rep = JSON.parse @response.body
diff --git a/test/integration/create_report_test.rb b/test/integration/create_report_test.rb
new file mode 100644
index 0000000..f0978e8
--- /dev/null
+++ b/test/integration/create_report_test.rb
@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class CreateReportTest < ActionDispatch::IntegrationTest
+ test "process json body with missing content_type" do
+ raw_json = "{\"entries\":[{\"name\":\"addition\",\"central_tendency\":27474451.540838767,\"ips\":27474451.540838767,\"error\":122038,\"stddev\":122038,\"microseconds\":1087174.973022461,\"iterations\":29868949,\"cycles\":2715359}],\"options\":{\"compare\":true}}"
+
+ # at the point of writing this, benchmark-ips makes this request with a raw string and no content type
+ # this mimics that scenario
+ post "/reports", params: raw_json, headers: { "CONTENT_LENGTH" => raw_json.length }
+
+ assert_equal 200, status
+ end
+end
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index f595106..3009f53 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -2,16 +2,14 @@
class RoutingTest < ActionDispatch::IntegrationTest
def test_short_id
- data = <<-DATA
-[{
- "name": "test",
- "ips": 10.1,
- "stddev": 0.3,
- "microseconds": 3322,
- "iterations": 221,
- "cycles": 16
-}]
- DATA
+ data = [{
+ name: "test",
+ ips: 10.1,
+ stddev: 0.3,
+ microseconds: 3322,
+ iterations: 221,
+ cycles: 16
+ }]
report = Report.create! report: data
diff --git a/test/models/report_test.rb b/test/models/report_test.rb
new file mode 100644
index 0000000..a1eca0d
--- /dev/null
+++ b/test/models/report_test.rb
@@ -0,0 +1,54 @@
+require 'test_helper'
+
+
+class ReportTest < ActiveSupport::TestCase
+ test "validates required attributes" do
+ report = Report.new({
+ entries: [{
+ name: "test",
+ ips: 10.1,
+ central_tendency: 10.1,
+ error: 23666,
+ stddev: 0.3,
+ microseconds: 3322,
+ iterations: 221,
+ cycles: 16
+ }]
+ })
+
+ assert report.valid?
+ end
+
+ test "requires entries" do
+ report = Report.new()
+
+ assert report.invalid?
+
+ assert_equal report.errors[:entries], ["can't be blank"]
+ end
+
+ test "shows invalid entries if validation fails" do
+ report = Report.new({
+ entries: [{
+ name: "test",
+ central_tendency: 10.1,
+ error: 23666,
+ microseconds: 3322,
+ iterations: 221,
+ cycles: 16
+ },
+ {
+ name: "test2",
+ central_tendency: 10.1,
+ microseconds: 3322,
+ iterations: 221,
+ ips: 4,
+ cycles: 16
+ }]
+ })
+
+ assert report.invalid?
+
+ assert_equal report.errors[:entries], ['missing attributes: {"name"=>"test", "central_tendency"=>10.1, "error"=>23666, "microseconds"=>3322, "iterations"=>221, "cycles"=>16} (ips, stddev), {"name"=>"test2", "central_tendency"=>10.1, "microseconds"=>3322, "iterations"=>221, "ips"=>4, "cycles"=>16} (stddev)']
+ end
+end
|