Permalink
Browse files

Upgrade dependencies

  • Loading branch information...
1 parent d205495 commit 055b4bfc0cf39a6fe8cbb51397b5f2477169e24f @devinus committed Dec 17, 2013
Showing with 17 additions and 15 deletions.
  1. +1 −1 mix.exs
  2. +2 −2 mix.lock
  3. +1 −1 test/dynamo/cowboy/connection_test.exs
  4. +1 −1 test/dynamo/cowboy/router_test.exs
  5. +8 −8 test/dynamo/cowboy/ssl_test.exs
  6. +4 −2 test/test_helper.exs
View
@@ -3,7 +3,7 @@ defmodule Dynamo.Mixfile do
def project do
[ app: :dynamo,
- elixir: "~> 0.11.2-dev",
+ elixir: "~> 0.12.0",
version: "0.1.0-dev",
name: "Dynamo",
source_url: "https://github.com/elixir-lang/dynamo",
View
@@ -1,5 +1,5 @@
-[ "cowboy": {:git, "git://github.com/extend/cowboy.git", "df818625545d565b8b76fbc445063a4822114b93", []},
+[ "cowboy": {:git, "git://github.com/extend/cowboy.git", "9f33a20d9425daf7491836e73f503c206cc170be", []},
"cowlib": {:git, "git://github.com/extend/cowlib.git", "63298e8e160031a70efff86a1acde7e7db1fcda6", [{:ref, "0.4.0"}]},
- "hackney": {:git, "git://github.com/benoitc/hackney.git", "5b0f7eb949ebebd6fabfbc4e08a7b7231850606a", []},
+ "hackney": {:git, "git://github.com/benoitc/hackney.git", "9f08643d86480f19125eb02d8bbb610b4d82ad6a", []},
"mimetypes": {:git, "git://github.com/spawngrid/mimetypes.git", "47d37a977a7d633199822bf6b08353007483d00f", []},
"ranch": {:git, "git://github.com/extend/ranch.git", "5df1f222f94e08abdcab7084f5e13027143cc222", [{:ref, "0.9.0"}]} ]
@@ -491,7 +491,7 @@ defmodule Dynamo.Cowboy.ConnectionTest do
defp request(verb, path, headers // [], body // "") do
{ :ok, status, headers, client } =
:hackney.request(verb, "http://127.0.0.1:8011" <> path, headers, body, [])
- { :ok, body, _ } = :hackney.body(client)
+ { :ok, body } = :hackney.body(client)
{ status, headers, body }
end
end
@@ -41,7 +41,7 @@ defmodule Dynamo.Cowboy.RouterTest do
defp request(verb, path) do
{ :ok, status, headers, client } =
:hackney.request(verb, "http://127.0.0.1:8012" <> path, [], "", [])
- { :ok, body, _ } = :hackney.body(client)
+ { :ok, body } = :hackney.body(client)
{ status, headers, body }
end
end
@@ -42,41 +42,41 @@ defmodule Dynamo.Cowboy.SSLTest do
test :http_scheme do
assert { :ok, 200, _, client } = :hackney.request(:get, "http://127.0.0.1:8021/scheme", [], "", [])
- assert { :ok, "scheme: http", _ } = :hackney.body(client)
+ assert { :ok, "scheme: http" } = :hackney.body(client)
end
test :http_host_url do
assert { :ok, 200, _, client } = :hackney.request(:get, "http://127.0.0.1:8021/host_url", [], "", [])
- assert { :ok, "host_url: http://127.0.0.1:8021", _ } = :hackney.body(client)
+ assert { :ok, "host_url: http://127.0.0.1:8021" } = :hackney.body(client)
end
test :http_host do
assert { :ok, 200, _, client } = :hackney.request(:get, "http://127.0.0.1:8021/host", [], "", [])
- assert { :ok, "host: 127.0.0.1", _ } = :hackney.body(client)
+ assert { :ok, "host: 127.0.0.1" } = :hackney.body(client)
end
test :http_port do
assert { :ok, 200, _, client } = :hackney.request(:get, "http://127.0.0.1:8021/port", [], "", [])
- assert { :ok, "port: 8021", _ } = :hackney.body(client)
+ assert { :ok, "port: 8021" } = :hackney.body(client)
end
test :https_scheme do
assert { :ok, 200, _, client } = :hackney.request(:get, "https://127.0.0.1:8022/scheme", [], "", [])
- assert { :ok, "scheme: https", _ } = :hackney.body(client)
+ assert { :ok, "scheme: https" } = :hackney.body(client)
end
test :https_host_url do
assert { :ok, 200, _, client } = :hackney.request(:get, "https://127.0.0.1:8022/host_url", [], "", [])
- assert { :ok, "host_url: https://127.0.0.1:8022", _ } = :hackney.body(client)
+ assert { :ok, "host_url: https://127.0.0.1:8022" } = :hackney.body(client)
end
test :https_host do
assert { :ok, 200, _, client } = :hackney.request(:get, "https://127.0.0.1:8022/host", [], "", [])
- assert { :ok, "host: 127.0.0.1", _ } = :hackney.body(client)
+ assert { :ok, "host: 127.0.0.1" } = :hackney.body(client)
end
test :https_port do
assert { :ok, 200, _, client } = :hackney.request(:get, "https://127.0.0.1:8022/port", [], "", [])
- assert { :ok, "port: 8022", _ } = :hackney.body(client)
+ assert { :ok, "port: 8022" } = :hackney.body(client)
end
end
View
@@ -5,8 +5,10 @@ System.put_env("MIX_ENV", "dev")
ExUnit.start
-:application.start(:edown)
-:application.start(:hackney)
+:ok = :application.start(:asn1)
+:ok = :application.start(:public_key)
+:ok = :application.start(:ssl)
+:ok = :application.start(:hackney)
defmodule MixHelpers do
import ExUnit.Assertions

0 comments on commit 055b4bf

Please sign in to comment.