1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

fix mocked elb tests by including InstanceProtocol

closes #1090
This commit is contained in:
geemus 2012-08-16 11:57:46 -05:00
parent ffdee0185f
commit 896c2405cd
3 changed files with 4 additions and 4 deletions

View file

@ -70,7 +70,7 @@ class AWS
}
DESCRIBE_LOAD_BALANCER_POLICY_TYPES = BASIC.merge({
'DescribeLoadBalancerPolicyTypesResult' => { 'PolicyTypeDescriptions' => [POLICY_TYPE] }
'DescribeLoadBalancerPolicyTypesResult' => {'PolicyTypeDescriptions' => [POLICY_TYPE] }
})
CONFIGURE_HEALTH_CHECK = BASIC.merge({

View file

@ -8,8 +8,8 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
tests("#create_load_balancer_listeners").formats(AWS::ELB::Formats::BASIC) do
listeners = [
{'Protocol' => 'TCP','InstanceProtocol' => 'TCP', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
{'Protocol' => 'HTTP', 'LoadBalancerPort' => 80, 'InstancePort' => 80}
{'Protocol' => 'TCP', 'InstanceProtocol' => 'TCP', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
{'Protocol' => 'HTTP', 'InstanceProtocol' => 'HTTP', 'LoadBalancerPort' => 80, 'InstancePort' => 80}
]
response = Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
response

View file

@ -7,7 +7,7 @@ Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do
tests("#create_load_balancer").formats(AWS::ELB::Formats::CREATE_LOAD_BALANCER) do
zones = ['us-east-1a']
listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'HTTP'}]
listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'InstanceProtocol' => 'HTTP', 'Protocol' => 'HTTP'}]
Fog::AWS[:elb].create_load_balancer(zones, @load_balancer_id, listeners).body
end