Skip to content

Updated how Supervisor and children are started and configured, remove elixir 1.4 support, update Travis CI #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: elixir

elixir:
- 1.4
- 1.5
- 1.6
- 1.7
Expand All @@ -20,12 +19,10 @@ matrix:
otp_release: 19.3
- elixir: 1.8
otp_release: 19.3
- elixir: 1.4
otp_release: 21
- elixir: 1.5
otp_release: 21
otp_release: 21.0
- elixir: 1.6
otp_release: 21
otp_release: 21.0

before_script:
- "export DISPLAY=:99.0"
Expand Down
1 change: 1 addition & 0 deletions lib/hound/connection_server.ex
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
defmodule Hound.ConnectionServer do
@moduledoc false
use Agent

def start_link(options \\ []) do
driver = options[:driver] || Application.get_env(:hound, :driver, "selenium")
Expand Down
2 changes: 1 addition & 1 deletion lib/hound/session_server.ex
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Hound.SessionServer do
use GenServer
@name __MODULE__

def start_link do
def start_link(_options) do
GenServer.start_link(__MODULE__, %{}, name: @name)
end

Expand Down
14 changes: 7 additions & 7 deletions lib/hound/supervisor.ex
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ defmodule Hound.Supervisor do
use Supervisor

def start_link(options \\ []) do
:supervisor.start_link(__MODULE__, [options])
Supervisor.start_link(__MODULE__, options, name: __MODULE__)
end


def init([options]) do
@impl true
def init(options) do
children = [
worker(Hound.ConnectionServer, [options]),
worker(Hound.SessionServer, [])
{Hound.ConnectionServer, options},
Hound.SessionServer
]

# See http://elixir-lang.org/docs/stable/Supervisor.Behaviour.html
# See https://hexdocs.pm/elixir/master/Supervisor.html#content
# for other strategies and supported options
supervise(children, strategy: :one_for_one)
Supervisor.init(children, strategy: :one_for_one)
end
end
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defmodule Hound.Mixfile do
def project do
[ app: :hound,
version: @version,
elixir: ">= 1.4.0",
elixir: ">= 1.5.0",
description: "Webdriver library for integration testing and browser automation",
source_url: "https://github.com/HashNuke/hound",
deps: deps(),
Expand Down