From d9cb2832f806fbb98c55bc44ea18647cdb6e8496 Mon Sep 17 00:00:00 2001 From: "Daniel (dmilith) Dettlaff" Date: Wed, 4 Nov 2015 23:15:07 +0100 Subject: [PATCH 1/2] Updated dependencies without destroying all the tests. --- mix.exs | 6 +++--- mix.lock | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mix.exs b/mix.exs index 28176da..31ebd79 100644 --- a/mix.exs +++ b/mix.exs @@ -30,11 +30,11 @@ defmodule WebDriver.Mixfile do # { :foobar, "0.1", git: "https://github.com/elixir-lang/foobar.git" } defp deps do [ - {:ibrowse, github: "cmullaparthi/ibrowse", tag: "v4.1.0"}, + {:ibrowse, github: "VerKnowSys/ibrowse", tag: "v4.2"}, {:httpotion, "~> 0.2.4"}, - {:jazz, "~> 0.2.0"}, + {:jazz, "~> 0.2.1"}, + {:earmark, "~>0.1.19", only: :dev}, {:mock, github: "jjh42/mock", only: :test}, - {:earmark, "~>0.1.10", only: :dev}, {:ex_doc, "~>0.6", only: :dev} ] end diff --git a/mix.lock b/mix.lock index 8aa9491..6264916 100644 --- a/mix.lock +++ b/mix.lock @@ -1,11 +1,11 @@ -%{"earmark": {:hex, :earmark, "0.1.10"}, +%{"earmark": {:hex, :earmark, "0.1.19"}, "ex_doc": {:hex, :ex_doc, "0.6.1"}, "hoedown": {:git, "git://github.com/hoedown/hoedown.git", "34d28b5f1af41a8879985f2550ddcaa54c4e432b", []}, "httpotion": {:hex, :httpotion, "0.2.4"}, - "ibrowse": {:git, "git://github.com/cmullaparthi/ibrowse.git", "7871e2ebe8811efb64e1917e2de455fa87e8dfe3", [tag: "v4.1.0"]}, - "jazz": {:hex, :jazz, "0.2.0"}, + "ibrowse": {:git, "https://github.com/VerKnowSys/ibrowse.git", "fd81d44182507c23445ed720df8c30e2e8da9d9b", [tag: "v4.2"]}, + "jazz": {:hex, :jazz, "0.2.1"}, "jsonex": {:git, "git://github.com/marcelog/jsonex.git", "82e6c416eed5e791073427bf3079d7ab7b85a1e1", []}, "jsx": {:git, "git://github.com/talentdeficit/jsx.git", "507fa4c41db33c81e925ab53f4d789d234aaff2f", []}, "markdown": {:git, "git://github.com/devinus/markdown.git", "a428908a6dd88f351775d1d3da530a1a2aa0d6cb", []}, - "meck": {:git, "git://github.com/eproxus/meck.git", "dde759050eff19a1a80fd854d7375174b191665d", [tag: "0.8.2"]}, - "mock": {:git, "git://github.com/jjh42/mock.git", "275109db347caf3449b6d123bd4da720fb08b28e", []}} + "meck": {:git, "https://github.com/eproxus/meck.git", "dde759050eff19a1a80fd854d7375174b191665d", [tag: "0.8.2"]}, + "mock": {:git, "https://github.com/jjh42/mock.git", "275109db347caf3449b6d123bd4da720fb08b28e", []}} From f1ff7bb971c32d2f78e33fdd957e8d5775caee42 Mon Sep 17 00:00:00 2001 From: "Daniel (dmilith) Dettlaff" Date: Thu, 7 Jan 2016 11:25:12 +0100 Subject: [PATCH 2/2] Fixed two issues with Elixir 1.2. --- lib/webdriver/error.ex | 2 +- lib/webdriver/protocol.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/webdriver/error.ex b/lib/webdriver/error.ex index 6347031..3f5984e 100644 --- a/lib/webdriver/error.ex +++ b/lib/webdriver/error.ex @@ -72,7 +72,7 @@ defmodule WebDriver.Error do Create an ErrorMessage record from raw protocol error data. """ def build_message([{"message", message},{"screen", screen},{"class", class},{"stackTrace", stack_trace}])do - ErrorMessage[ message: message, screen: screen, class: class, stack_trace: stack_trace ] + %ErrorMessage{ message: message, screen: screen, class: class, stack_trace: stack_trace } end @doc """ diff --git a/lib/webdriver/protocol.ex b/lib/webdriver/protocol.ex index cfc867b..c31fd6f 100644 --- a/lib/webdriver/protocol.ex +++ b/lib/webdriver/protocol.ex @@ -882,7 +882,7 @@ defmodule WebDriver.Protocol do # Cause some use upper case and some dont... url = Keyword.get(headers, :Location, Keyword.get(headers, :location)) # Follow redirect - request = Request[method: :GET, url: url, headers: [{"Accept", "application/json;charset=UTF-8"}]] + request = %Request{method: :GET, url: url, headers: [{"Accept", "application/json;charset=UTF-8"}]} send_request root_url, request end