httpimagestore 1.4.1 → 1.5.0

data/features/cache-control.feature

@@ -8,18 +8,18 @@ Feature: S3 object Cache-Control header settings
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
-		path "hash"			"#{input_digest}.#{image_mime_extension}"
-		path "hash-name"		"#{input_digest}-#{image_name}.#{image_mime_extension}"
+		path "hash"       "#{input_digest}.#{image_mime_extension}"
+		path "hash-name"  "#{input_digest}-#{image_name}.#{image_mime_extension}"
 
 		put "thumbnail" {
 			thumbnail "input" {
-				"no-cache"	operation="crop" width=128 height=128 format="jpeg"
-				"cache"		operation="crop" width=256 height=256 format="jpeg"
+				"no-cache"    operation="crop" width=128 height=128 format="jpeg"
+				"cache"       operation="crop" width=256 height=256 format="jpeg"
 			}
 
-			store_s3 "input"	bucket="@AWS_S3_TEST_BUCKET@" public=true path="hash"
-			store_s3 "no-cache"	bucket="@AWS_S3_TEST_BUCKET@" public=true path="hash-name"
-			store_s3 "cache"	bucket="@AWS_S3_TEST_BUCKET@" public=true path="hash-name" cache-control="public, max-age=31557600, s-maxage=0"
+			store_s3 "input"     bucket="@AWS_S3_TEST_BUCKET@" public=true path="hash"
+			store_s3 "no-cache"  bucket="@AWS_S3_TEST_BUCKET@" public=true path="hash-name"
+			store_s3 "cache"     bucket="@AWS_S3_TEST_BUCKET@" public=true path="hash-name" cache-control="public, max-age=31557600, s-maxage=0"
 		}
 		"""
 
@@ -38,5 +38,4 @@ Feature: S3 object Cache-Control header settings
 		"""
 		And http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/4006450256177f4a.jpg Cache-Control header will not be set
 		And http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/4006450256177f4a-no-cache.jpg Cache-Control header will not be set
-		And http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/4006450256177f4a-cache.jpg Cache-Control header will be public, max-age=31557600, s-maxage=0
-
+		And http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/4006450256177f4a-cache.jpg Cache-Control header will be public, max-age=31557600, s-maxage=0

data/features/compatibility.feature

@@ -9,49 +9,63 @@ Feature: Image list based thumbnailing and S3 storage
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
-		path "hash"		"#{input_digest}.#{image_mime_extension}"
-		path "hash-name"	"#{input_digest}/#{image_name}.#{image_mime_extension}"
-		path "structured"	"#{dirname}/#{input_digest}/#{basename}.#{image_mime_extension}"
-		path "structured-name"	"#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{image_mime_extension}"
+		path "hash"             "#{input_digest}.#{image_mime_extension}"
+		path "hash-name"        "#{input_digest}/#{image_name}.#{image_mime_extension}"
+		path "structured"       "#{dirname}/#{input_digest}/#{basename}.#{image_mime_extension}"
+		path "structured-name"  "#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{image_mime_extension}"
+		path "flexi-original"   "#{hash}.jpg"
 
 		put "thumbnail" ":name_list" ":path/.+/" {
 			thumbnail "input" {
-				"small"		operation="crop"	width=128	height=128	format="jpeg"		if-image-name-on="#{name_list}"
-				"tiny_png"	operation="crop"	width=32	height=32	format="png"		if-image-name-on="#{name_list}"
-				"bad"		operation="crop"	width=0		height=0				if-image-name-on="#{name_list}"
+				"small"             operation="crop"        width=128       height=128      format="jpeg"           if-image-name-on="#{name_list}"
+				"tiny_png"          operation="crop"        width=32        height=32       format="png"            if-image-name-on="#{name_list}"
+				"bad"               operation="crop"        width=0         height=0                                if-image-name-on="#{name_list}"
 			}
 
-			store_s3 "input"	bucket="@AWS_S3_TEST_BUCKET@"		path="structured"	public=true
-			store_s3 "small"	bucket="@AWS_S3_TEST_BUCKET@"		path="structured-name"	public=true if-image-name-on="#{name_list}"
-			store_s3 "tiny_png"	bucket="@AWS_S3_TEST_BUCKET@"		path="structured-name"	public=true if-image-name-on="#{name_list}"
+			store_s3 "input"     bucket="@AWS_S3_TEST_BUCKET@"   path="structured"       public=true
+			store_s3 "small"     bucket="@AWS_S3_TEST_BUCKET@"   path="structured-name"  public=true if-image-name-on="#{name_list}"
+			store_s3 "tiny_png"  bucket="@AWS_S3_TEST_BUCKET@"   path="structured-name"  public=true if-image-name-on="#{name_list}"
 
 			output_store_url {
 				"input"
-				"small"		if-image-name-on="#{name_list}"
-				"tiny_png"	if-image-name-on="#{name_list}"
+				"small"             if-image-name-on="#{name_list}"
+				"tiny_png"          if-image-name-on="#{name_list}"
 			}
 		}
 
 		put "thumbnail" ":name_list" {
 			thumbnail "input" {
-				"small"		operation="crop"	width=128	height=128	format="jpeg"	if-image-name-on="#{name_list}"
-				"tiny_png"	operation="crop"	width=32	height=32	format="png"	if-image-name-on="#{name_list}"
+				"small"             operation="crop"        width=128       height=128      format="jpeg"   if-image-name-on="#{name_list}"
+				"tiny_png"          operation="crop"        width=32        height=32       format="png"    if-image-name-on="#{name_list}"
 			}
 
-			store_s3 "input"	bucket="@AWS_S3_TEST_BUCKET@"		path="hash"	 public=true
-			store_s3 "small"	bucket="@AWS_S3_TEST_BUCKET@"		path="hash-name" public=true if-image-name-on="#{name_list}"
-			store_s3 "tiny_png"	bucket="@AWS_S3_TEST_BUCKET@"		path="hash-name" public=true if-image-name-on="#{name_list}"
+			store_s3 "input"     bucket="@AWS_S3_TEST_BUCKET@"   path="hash"      public=true
+			store_s3 "small"     bucket="@AWS_S3_TEST_BUCKET@"   path="hash-name" public=true if-image-name-on="#{name_list}"
+			store_s3 "tiny_png"  bucket="@AWS_S3_TEST_BUCKET@"   path="hash-name" public=true if-image-name-on="#{name_list}"
 
 			output_store_url {
 				"input"
-				"small"		if-image-name-on="#{name_list}"
-				"tiny_png"	if-image-name-on="#{name_list}"
-				"bad"		if-image-name-on="#{name_list}"
+				"small"             if-image-name-on="#{name_list}"
+				"tiny_png"          if-image-name-on="#{name_list}"
+				"bad"               if-image-name-on="#{name_list}"
 			}
 		}
+
+		# Forward compatible getting of thumbnails
+		get "thumbnail" ":hash/[0-f]{16}/" ":type/.*-square.jpg/" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="flexi-original"
+			thumbnail "original" "thumbnail" operation="crop" width="50" height="50"
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		get "thumbnail" ":hash/[0-f]{16}/" ":type/.*-normal.jpg/" {
+			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="flexi-original"
+			thumbnail "original" "thumbnail" operation="fit" width="100" height="2000"
+			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
+		}
 		"""
 
-	@compatibility @test
+	@compatibility
 	Scenario: Putting original and its thumbnails to S3 bucket
 		Given there is no 4006450256177f4a.jpg file in S3 bucket
 		And there is no 4006450256177f4a/small.jpg file in S3 bucket
@@ -127,3 +141,14 @@ Feature: Image list based thumbnailing and S3 storage
 		And http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/test/图像/4006450256177f4a/测试.jpg will contain JPEG image of size 509x719
 		And http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/test/图像/4006450256177f4a/测试-small.jpg will contain JPEG image of size 128x128
 
+	@compatibility @forward @test
+	Scenario: Getting thumbanils requested with compatibility API from flexi bucket
+			Given test.jpg file content is stored in S3 under 1234567890123456.jpg
+		When I do GET request http://localhost:3000/thumbnail/1234567890123456/foobar-blah-square.jpg
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 50x50
+		When I do GET request http://localhost:3000/thumbnail/1234567890123456/foobar-blah-normal.jpg
+		Then response status will be 200
+		And response content type will be image/jpeg
+		Then response body will contain JPEG image of size 100x141

data/features/error-reporting.feature

@@ -9,28 +9,28 @@ Feature: Image list based thumbnailing and S3 storage
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
-		path "structured-name"	"#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{image_mime_extension}"
-		path "missing"		"blah"
-		path "zero"		"zero"
+		path "structured-name"  "#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{image_mime_extension}"
+		path "missing"          "blah"
+		path "zero"             "zero"
 
 		put "multipart" ":name_list" {
 			thumbnail "input" {
-				"small"		operation="crop"	width=128	height=128				if-image-name-on="#{name_list}"
-				"bad"		operation="crop"	width=0		height=0				if-image-name-on="#{name_list}"
-				"bad_dim"	operation="crop"	width="128x"	height=128				if-image-name-on="#{name_list}"
-				"superlarge"	operation="crop"	width=16000	height=16000				if-image-name-on="#{name_list}"
-				"large_png"	operation="crop"	width=7000	height=7000	format="png"		if-image-name-on="#{name_list}"
-				"bad_opts"	operation="crop"	width=128	height=128	options="foo=bar"	if-image-name-on="#{name_list}"
+				"small"             operation="crop"        width=128       height=128                              if-image-name-on="#{name_list}"
+				"bad"               operation="crop"        width=0         height=0                                if-image-name-on="#{name_list}"
+				"bad_dim"           operation="crop"        width="128x"    height=128                              if-image-name-on="#{name_list}"
+				"superlarge"        operation="crop"        width=16000     height=16000                            if-image-name-on="#{name_list}"
+				"large_png"         operation="crop"        width=7000      height=7000     format="png"            if-image-name-on="#{name_list}"
+				"bad_opts"          operation="crop"        width=128       height=128      options="foo=bar"       if-image-name-on="#{name_list}"
 			}
 		}
 
 		put "singlepart" ":name_list" {
-			thumbnail "input"	"small"		operation="crop"	width=128	height=128				if-image-name-on="#{name_list}"
-			thumbnail "input"	"bad"		operation="crop"	width=0		height=0				if-image-name-on="#{name_list}"
-			thumbnail "input"	"bad_dim"	operation="crop"	width="128x"	height=128				if-image-name-on="#{name_list}"
-			thumbnail "input"	"superlarge"	operation="crop"	width=16000	height=16000				if-image-name-on="#{name_list}"
-			thumbnail "input"	"large_png"	operation="crop"	width=7000	height=7000	format="png"		if-image-name-on="#{name_list}"
-			thumbnail "input"	"bad_opts"	operation="crop"	width=128	height=128	options="foo=bar"	if-image-name-on="#{name_list}"
+			thumbnail "input"    "small"         operation="crop"        width=128       height=128                              if-image-name-on="#{name_list}"
+			thumbnail "input"    "bad"           operation="crop"        width=0         height=0                                if-image-name-on="#{name_list}"
+			thumbnail "input"    "bad_dim"       operation="crop"        width="128x"    height=128                              if-image-name-on="#{name_list}"
+			thumbnail "input"    "superlarge"    operation="crop"        width=16000     height=16000                            if-image-name-on="#{name_list}"
+			thumbnail "input"    "large_png"     operation="crop"        width=7000      height=7000     format="png"            if-image-name-on="#{name_list}"
+			thumbnail "input"    "bad_opts"      operation="crop"        width=128       height=128      options="foo=bar"       if-image-name-on="#{name_list}"
 		}
 
 		get "s3" {
@@ -250,4 +250,3 @@ Feature: Image list based thumbnailing and S3 storage
 		"""
 		cannot generate path 'no_image_meta' from template '#{image_mime_extension}': image 'input' does not have data for variable 'image_mime_extension'
 		"""
-

data/features/flexi.feature

@@ -1,8 +1,8 @@
 Feature: Flexible API with two storage options and Facebook like thumbnailing URL format
-	Features two storage apporaches: with JPEG conversion and limiting in size - for user provided content - and storing literaly.
+	Features two storage approaches: with JPEG conversion and limiting in size - for user provided content - and storing as is.
 	POST requests will end up with server side generated storage key based on input data digest.
-	PUT requsts can be used to store image under provided storage key.
-	Thumbnail GET API is similart to described in https://developers.facebook.com/docs/reference/api/using-pictures/#sizes.
+	PUT requests can be used to store image under provided storage key.
+	Thumbnail GET API is similar to described in https://developers.facebook.com/docs/reference/api/using-pictures/#sizes.
 	Stored object extension and content type is determined from image data.
 
 	Background:
@@ -256,5 +256,4 @@ Feature: Flexible API with two storage options and Facebook like thumbnailing UR
 		And I do GET request http://localhost:3000/pictures/test.png?height=321
 		Then response status will be 200
 		And response content type will be image/png
-		Then response body will contain PNG image of size 227x321
-
+		Then response body will contain PNG image of size 227x321

data/features/health-check.feature

@@ -26,5 +26,4 @@ Feature: Health check URL
 		And response body will be CRLF ended lines
 		"""
 		Connection refused - connect(2) (http://localhost:3100)
-		"""
-
+		"""

data/features/request-matching.feature

@@ -0,0 +1,211 @@
+Feature: Request matching
+	Incoming requests needs to be matched in flexible way and appropriate data needs to be available in form of variables used to parametrize processing.
+
+	Background:
+		Given httpthumbnailer server is running at http://localhost:3100/health_check
+		Given httpimagestore server is running at http://localhost:3000/health_check with the following configuration
+		"""
+		# URI segment matchers
+		get "string" {
+			output_text "path: '#{path}'"
+		}
+
+		get "any" "default" ":test1" ":test2?foo" ":test3?bar" ":test4?baz" {
+			output_text "test1: '#{test1}' test2: '#{test2}' test3: '#{test3}' test4: '#{test4}' path: '#{path}'"
+		}
+		get "any" ":test1" ":test2" {
+			output_text "test1: '#{test1}' test2: '#{test2}' path: '#{path}'"
+		}
+
+		get "regexp1" ":test1/a.c/" ":test2/.*/" {
+			output_text "test1: '#{test1}' test2: '#{test2}' path: '#{path}'"
+		}
+		get "regexp-404" ":test1/a.c.*/" ":test2/\\./" {
+			output_text "test1: '#{test1}' test2: '#{test2}' path: '#{path}'"
+		}
+
+		get "regexp" "named" "/(?<test1>..)-(?<test2>..)/" ":test3/.*/" {
+			output_text "test1: '#{test1}' test2: '#{test2}' test3: '#{test3}' path: '#{path}'"
+		}
+		get "regexp" "named" "nocapture" "/..-../" {
+			output_text "path: '#{path}'"
+		}
+		get "regexp" "named" "bad1" "/(?<test1>..)-(?<test1>..)/" ":test3/.*/" {
+			output_text "test1: '#{test1}' test2: '#{test2}' test3: '#{test3}' path: '#{path}'"
+		}
+		get "regexp" "named" "bad2" "/(?<test1>..)-(?<test1>..)/" ":test3/.*/" {
+			output_text "test1: '#{test1}' test3: '#{test3}' path: '#{path}'"
+		}
+
+		# Query string matchers
+		get "query" "key-value" "&hello=world" {
+			output_text "query key-value matched path: '#{path}'"
+		}
+
+		get "query" "key" "default" "&:hello?abc" {
+			output_text "key: '#{hello}' path: '#{path}'"
+		}
+		get "query" "key" "&:hello" {
+			output_text "key: '#{hello}' path: '#{path}'"
+		}
+		get "query" "options" {
+			output_text "query_string_options: '#{query_string_options}' path: '#{path}'"
+		}
+		"""
+
+	@request-matching @string
+	Scenario: Matching URI segment with strings
+		When I do GET request http://localhost:3000/string/hello/world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		path: 'hello/world'
+		"""
+
+	@request-matching @capture-any
+	Scenario: Capturing any URI segment
+		When I do GET request http://localhost:3000/any/foo/bar/hello/world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		test1: 'foo' test2: 'bar' path: 'hello/world'
+		"""
+
+	@request-matching @capture-any-default
+	Scenario: Capturing any URI segment with default value
+		When I do GET request http://localhost:3000/any/default/foo/bar
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		test1: 'foo' test2: 'bar' test3: 'bar' test4: 'baz' path: ''
+		"""
+
+	@request-matching @capture-regexp
+	Scenario: Capturing URI segment with regexp match
+		When I do GET request http://localhost:3000/regexp1/abc/foobar/hello/world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		test1: 'abc' test2: 'foobar/hello/world' path: ''
+		"""
+		When I do GET request http://localhost:3000/regexp2/abc/foobar/hello/world
+		Then response status will be 404
+
+	@request-matching @capture-named-regexp
+	Scenario: Capturing URI segment with named regexp match
+		When I do GET request http://localhost:3000/regexp/named/ab-12/hello/world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		test1: 'ab' test2: '12' test3: 'hello/world' path: ''
+		"""
+		When I do GET request http://localhost:3000/regexp/named/nocapture/ab-12/hello/world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		path: 'hello/world'
+		"""
+		When I do GET request http://localhost:3000/regexp/named/ab-12
+		Then response status will be 404
+		When I do GET request http://localhost:3000/regexp/named/ab-123/hello/world
+		Then response status will be 404
+		When I do GET request http://localhost:3000/regexp/named/bad1/ab-12/hello/world
+		Then response status will be 500
+		When I do GET request http://localhost:3000/regexp/named/bad2/ab-12/hello/world
+		Then response status will be 500
+		And response body will be CRLF ended lines
+		"""
+		matched more arguments than named (3 for 2)
+		"""
+
+	@request-matching @query-key-value
+	Scenario: Capturing URI by presence of given key-value query string pair
+		When I do GET request http://localhost:3000/query/key-value/hello/world?hello=world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		query key-value matched path: 'hello/world'
+		"""
+		When I do GET request http://localhost:3000/query/key-value/hello/world?foo=bar&hello=world&bar=baz
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		query key-value matched path: 'hello/world'
+		"""
+		When I do GET request http://localhost:3000/query/key-value/hello/world
+		Then response status will be 404
+		When I do GET request http://localhost:3000/query/key-value/hello/world?hello=Xorld
+		Then response status will be 404
+		When I do GET request http://localhost:3000/query/key-value/hello/world?heXlo=world
+		Then response status will be 404
+
+	@request-matching @query-key
+	Scenario: Capturing URI by query string key presence
+		When I do GET request http://localhost:3000/query/key/hello/world?hello=world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		key: 'world' path: 'hello/world'
+		"""
+		When I do GET request http://localhost:3000/query/key/hello/world?foo=bar&hello=foobar&bar=baz
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		key: 'foobar' path: 'hello/world'
+		"""
+		When I do GET request http://localhost:3000/query/key/hello/world
+		Then response status will be 404
+		When I do GET request http://localhost:3000/query/key/hello/world?heXlo=world
+		Then response status will be 404
+
+	@request-matching @query-key-default
+	Scenario: Capturing URI by query string key presence
+		When I do GET request http://localhost:3000/query/key/default/hello/world?hello=world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		key: 'world' path: 'hello/world'
+		"""
+		When I do GET request http://localhost:3000/query/key/default/hello/world?foo=bar&hello=foobar&bar=baz
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		key: 'foobar' path: 'hello/world'
+		"""
+		When I do GET request http://localhost:3000/query/key/default/hello/world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		key: 'abc' path: 'hello/world'
+		"""
+		When I do GET request http://localhost:3000/query/key/default/hello/world?heXlo=world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		key: 'abc' path: 'hello/world'
+		"""
+
+	@request-matching @query-string-options
+	Scenario: URI query string key-value pairs should always be available as query_string_options variable
+		When I do GET request http://localhost:3000/query/options/hello/world?foo=hello&bar=world
+		Then response status will be 200
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		query_string_options: 'bar:world,foo:hello' path: 'hello/world'
+		"""
+

data/features/s3-store-and-thumbnail.feature

@@ -10,30 +10,24 @@ Feature: Store limited original image in S3 and thumbnail based on request
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
-		path "original-hash"	"#{input_digest}.#{image_mime_extension}"
-		path "path"		"#{path}"
+		path "original-hash"  "#{input_digest}.#{image_mime_extension}"
+		path "path"           "#{path}"
 
 		put "original" {
 			thumbnail "input" "original" operation="limit" width=100 height=100 format="jpeg" quality=95
-
 			store_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="original-hash" cache-root="/tmp"
-
 			output_store_path "original"
 		}
 
 		get "thumbnail" "v1" ":path" ":operation" ":width" ":height" ":options?" {
 			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
-
 			thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="#{options}" quality=84 format="png"
-
 			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
 		}
 
 		get "thumbnail" "v2" ":operation" ":width" ":height" {
 			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path" cache-root="/tmp"
-
 			thumbnail "original" "thumbnail" operation="#{operation}" width="#{width}" height="#{height}" options="#{query_string_options}" quality=84 format="png"
-
 			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
 		}
 		"""
@@ -85,5 +79,4 @@ Feature: Store limited original image in S3 and thumbnail based on request
 		Then response status will be 200
 		And response content type will be image/png
 		Then response body will contain PNG image of size 50x50
-		And that image pixel at 2x2 should be of color green
-
+		And that image pixel at 2x2 should be of color green