From bdf446d67b940a063065585e4afc57bbc166cf5c Mon Sep 17 00:00:00 2001 From: Tim Lianov Date: Tue, 15 Jul 2014 12:15:42 +0400 Subject: [PATCH 1/2] fixed templates --- devops-service/tests/generate_tests.rb | 6 +++++- .../tests/templates/api_v2/10_create/00_filter.feature.erb | 4 ++-- .../tests/templates/api_v2/10_create/10_image.feature.erb | 6 +++--- .../tests/templates/api_v2/10_create/20_project.feature.erb | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/devops-service/tests/generate_tests.rb b/devops-service/tests/generate_tests.rb index 050dbda..11cbc46 100755 --- a/devops-service/tests/generate_tests.rb +++ b/devops-service/tests/generate_tests.rb @@ -38,7 +38,11 @@ templates = { "templates/api_v2/10_create/00_filter.feature.erb" => "features/api_v2/10_create/00_filter.feature", "templates/api_v2/10_create/10_image.feature.erb" => "features/api_v2/10_create/10_image.feature", "templates/api_v2/10_create/20_project.feature.erb" => "features/api_v2/10_create/20_project.feature", - "templates/api_v2/10_create/30_script.feature.erb" => "features/api_v2/10_create/30_script.feature" + "templates/api_v2/10_create/30_script.feature.erb" => "features/api_v2/10_create/30_script.feature", + + #update + "templates/api_v2/20_update/10_image.feature.erb" => "features/api_v2/20_update/10_image.feature" + } generator = Generator.new generator.make_tests_config diff --git a/devops-service/tests/templates/api_v2/10_create/00_filter.feature.erb b/devops-service/tests/templates/api_v2/10_create/00_filter.feature.erb index dac71fe..2a1198b 100644 --- a/devops-service/tests/templates/api_v2/10_create/00_filter.feature.erb +++ b/devops-service/tests/templates/api_v2/10_create/00_filter.feature.erb @@ -91,7 +91,7 @@ Feature: Filters When I send PUT '/v2.0/filter/openstack/image' query with body """ [ - "<%= @config["openstack"]["image"] %>" + "<%= @config["openstack"]["image"] %>", ] """ Then response should be '400' @@ -186,7 +186,7 @@ Feature: Filters When I send PUT '/v2.0/filter/ec2/image' query with body """ [ - "<%= @config["ec2"]["image"] %>" + "<%= @config["ec2"]["image"] %>", ] """ Then response should be '400' diff --git a/devops-service/tests/templates/api_v2/10_create/10_image.feature.erb b/devops-service/tests/templates/api_v2/10_create/10_image.feature.erb index 29932f2..664fb0b 100644 --- a/devops-service/tests/templates/api_v2/10_create/10_image.feature.erb +++ b/devops-service/tests/templates/api_v2/10_create/10_image.feature.erb @@ -515,7 +515,7 @@ Feature: Manage images @ec2 Scenario: Get info for single ec2 image - When I send GET '<%= @config["ec2"]["image"] %>' query + When I send GET '/v2.0/image/<%= @config["ec2"]["image"] %>' query Then response should be '200' And the Content-Type header should include 'application/json' And the JSON response should be an object @@ -532,12 +532,12 @@ Feature: Manage images @ec2 Scenario: Get info for single ec2 image without headers 'Accept' - When I send GET '<%= @config["ec2"]["image"] %>' query without headers 'Accept' + When I send GET '/v2.0/image/<%= @config["ec2"]["image"] %>' query without headers 'Accept' Then response should be '406' @ec2 Scenario: Get ec2 image without privileges - When I send GET '<%= @config["ec2"]["image"] %>' query with user without privileges + When I send GET '/v2.0/image/<%= @config["ec2"]["image"] %>' query with user without privileges Then response should be '401' @openstack diff --git a/devops-service/tests/templates/api_v2/10_create/20_project.feature.erb b/devops-service/tests/templates/api_v2/10_create/20_project.feature.erb index b416f2b..a56f477 100644 --- a/devops-service/tests/templates/api_v2/10_create/20_project.feature.erb +++ b/devops-service/tests/templates/api_v2/10_create/20_project.feature.erb @@ -13,7 +13,7 @@ Feature: create project "expires": null, "provider": "openstack", "users": [ - "<%= @config["user"] %>" + "<%= @config["username"] %>" ], "flavor": "<%= @config["openstack"]["flavor"] %>", "image": "<%= @config["openstack"]["image"] %>", @@ -42,7 +42,7 @@ Feature: create project "expires": null, "provider": "ec2", "users": [ - "<%= @config["user"] %>" + "<%= @config["username"] %>" ], "flavor": "<%= @config["ec2"]["flavor"] %>", "image": "<%= @config["ec2"]["image"] %>", From f8efb31aa31fe33efa327587fcdc12e497188950 Mon Sep 17 00:00:00 2001 From: Tim Lianov Date: Tue, 15 Jul 2014 12:22:51 +0400 Subject: [PATCH 2/2] added delete script template --- devops-service/tests/generate_tests.rb | 5 ++++- .../api_v2/90_delete/10_script.feature.erb | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 devops-service/tests/templates/api_v2/90_delete/10_script.feature.erb diff --git a/devops-service/tests/generate_tests.rb b/devops-service/tests/generate_tests.rb index 11cbc46..3f2c9ad 100755 --- a/devops-service/tests/generate_tests.rb +++ b/devops-service/tests/generate_tests.rb @@ -41,7 +41,10 @@ templates = { "templates/api_v2/10_create/30_script.feature.erb" => "features/api_v2/10_create/30_script.feature", #update - "templates/api_v2/20_update/10_image.feature.erb" => "features/api_v2/20_update/10_image.feature" + "templates/api_v2/20_update/10_image.feature.erb" => "features/api_v2/20_update/10_image.feature", + + #delete + "templates/api_v2/90_delete/10_script.feature.erb" => "features/api_v2/90_delete/10_script.feature" } generator = Generator.new diff --git a/devops-service/tests/templates/api_v2/90_delete/10_script.feature.erb b/devops-service/tests/templates/api_v2/90_delete/10_script.feature.erb new file mode 100644 index 0000000..1d57931 --- /dev/null +++ b/devops-service/tests/templates/api_v2/90_delete/10_script.feature.erb @@ -0,0 +1,16 @@ +@script +Feature: Delete script + + Scenario: Delete script with user without privileges + When I send DELETE '/v2.0/script/<%= @config["script"]["name"] %>' query with user without privileges + Then response should be '401' + + Scenario: Delete script without header 'Accept' + When I send DELETE '/v2.0/script/<%= @config["script"]["name"] %>' query without header 'Accept' + Then response should be '406' + + Scenario: Delete script with id '<%= @config["script"]["name"] %>' + When I send DELETE '/v2.0/script/<%= @config["script"]["name"] %>' query + Then response should be '200' + And the Content-Type header should include 'application/json' + And the JSON response should be an object