summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/twitter_api_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-02-12 10:24:15 +0100
committerlain <lain@soykaf.club>2018-02-12 10:24:15 +0100
commitb331cb449a46bbead19fea4fba59762c1a2e3a10 (patch)
tree5ce081e6f6b6b6305ec8a280adb53a64fd08a941 /test/web/twitter_api/twitter_api_controller_test.exs
parent8cf97ee8e15a36cbbf0964d5be53c88d29798163 (diff)
parent1bc34de4dfef5336d0dc165495ac66de2ffef2c6 (diff)
downloadpleroma-b331cb449a46bbead19fea4fba59762c1a2e3a10.tar.gz
pleroma-b331cb449a46bbead19fea4fba59762c1a2e3a10.zip
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
-rw-r--r--test/web/twitter_api/twitter_api_controller_test.exs14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 39f1cdd4c..f02e2c59e 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -504,7 +504,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
user = insert(:user)
follower_one = insert(:user)
follower_two = insert(:user)
- not_follower = insert(:user)
+ _not_follower = insert(:user)
{:ok, follower_one} = User.follow(follower_one, user)
{:ok, follower_two} = User.follow(follower_two, user)
@@ -522,7 +522,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
user = insert(:user)
followed_one = insert(:user)
followed_two = insert(:user)
- not_followed = insert(:user)
+ _not_followed = insert(:user)
{:ok, user} = User.follow(user, followed_one)
{:ok, user} = User.follow(user, followed_two)
@@ -538,7 +538,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
user = insert(:user)
followed_one = insert(:user)
followed_two = insert(:user)
- not_followed = insert(:user)
+ _not_followed = insert(:user)
{:ok, user} = User.follow(user, followed_one)
{:ok, user} = User.follow(user, followed_two)
@@ -553,7 +553,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
user = insert(:user)
followed_one = insert(:user)
followed_two = insert(:user)
- not_followed = insert(:user)
+ _not_followed = insert(:user)
{:ok, user} = User.follow(user, followed_one)
{:ok, user} = User.follow(user, followed_two)
@@ -570,7 +570,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
user = insert(:user)
followed_one = insert(:user)
followed_two = insert(:user)
- not_followed = insert(:user)
+ _not_followed = insert(:user)
{:ok, user} = User.follow(user, followed_one)
{:ok, user} = User.follow(user, followed_two)
@@ -585,7 +585,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
end
describe "POST /api/account/update_profile.json" do
- test "it updates a user's profile" do
+ test "it updates a user's profile", %{conn: conn} do
user = insert(:user)
conn = conn
@@ -627,7 +627,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
end
describe "GET /api/statusnet/tags/timeline/:tag.json" do
- test "it returns the tags timeline" do
+ test "it returns the tags timeline", %{conn: conn} do
user = insert(:user)
user_two = insert(:user, %{nickname: "shp@shitposter.club"})