Merge branch 'master' into 1287

pull/1293/head
Andrew Cravenho 6 years ago committed by GitHub
commit 1d569b7a14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      apps/block_scout_web/test/block_scout_web/features/viewing_blocks_test.exs
  2. 2
      apps/block_scout_web/test/block_scout_web/features/viewing_transactions_test.exs
  3. 6
      apps/block_scout_web/test/support/feature_case.ex

@ -1,5 +1,5 @@
defmodule BlockScoutWeb.ViewingBlocksTest do defmodule BlockScoutWeb.ViewingBlocksTest do
use BlockScoutWeb.FeatureCase, async: true use BlockScoutWeb.FeatureCase, async: false
alias BlockScoutWeb.{BlockListPage, BlockPage} alias BlockScoutWeb.{BlockListPage, BlockPage}
alias Explorer.Chain.Block alias Explorer.Chain.Block

@ -1,7 +1,7 @@
defmodule BlockScoutWeb.ViewingTransactionsTest do defmodule BlockScoutWeb.ViewingTransactionsTest do
@moduledoc false @moduledoc false
use BlockScoutWeb.FeatureCase, async: true use BlockScoutWeb.FeatureCase, async: false
alias BlockScoutWeb.{AddressPage, TransactionListPage, TransactionLogsPage, TransactionPage} alias BlockScoutWeb.{AddressPage, TransactionListPage, TransactionLogsPage, TransactionPage}
alias Explorer.Chain.Wei alias Explorer.Chain.Wei

@ -20,9 +20,13 @@ defmodule BlockScoutWeb.FeatureCase do
end end
end end
setup do setup tags do
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo) :ok = Ecto.Adapters.SQL.Sandbox.checkout(Explorer.Repo)
unless tags[:async] do
Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()})
end
metadata = Phoenix.Ecto.SQL.Sandbox.metadata_for(Explorer.Repo, self()) metadata = Phoenix.Ecto.SQL.Sandbox.metadata_for(Explorer.Repo, self())
{:ok, session} = Wallaby.start_session(metadata: metadata) {:ok, session} = Wallaby.start_session(metadata: metadata)
session = Wallaby.Browser.resize_window(session, 1200, 800) session = Wallaby.Browser.resize_window(session, 1200, 800)

Loading…
Cancel
Save