Skip to content
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

Update scalatest to 3.1.2 #77

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ val baseSettings = Seq(
libraryDependencies ++= Seq(
"com.twitter" %% "finagle-http" % finagleVersion,
"org.scalacheck" %% "scalacheck" % "1.14.0" % Test,
"org.scalatest" %% "scalatest" % "3.0.8" % Test
"org.scalatest" %% "scalatest" % "3.1.2" % Test
)
)

Original file line number Diff line number Diff line change
@@ -2,9 +2,11 @@ package com.twitter.finagle.oauth2

import com.twitter.finagle.http.{HeaderMap, ParamMap}
import org.scalatest._
import org.scalatest.Matchers._
import matchers.should.Matchers._
import org.scalatest.matchers
import org.scalatest.flatspec.AnyFlatSpec

class AuthHeaderSpec extends FlatSpec {
class AuthHeaderSpec extends AnyFlatSpec {

def createRequest(authorization: Option[String]): Request.ProtectedResource = authorization match {
case Some(s) =>
Original file line number Diff line number Diff line change
@@ -2,10 +2,12 @@ package com.twitter.finagle.oauth2

import com.twitter.finagle.http.{HeaderMap, ParamMap}
import org.scalatest._
import org.scalatest.Matchers._
import matchers.should.Matchers._
import com.twitter.util.{Await, Future}
import org.scalatest.matchers
import org.scalatest.flatspec.AnyFlatSpec

class AuthorizationCodeSpec extends FlatSpec {
class AuthorizationCodeSpec extends AnyFlatSpec {

it should "handle request" in {
val authorizationCode = GrantHandler.AuthorizationCode
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.twitter.finagle.oauth2

import com.twitter.finagle.http.{HeaderMap, ParamMap}
import org.scalatest.FlatSpec
import org.scalatest.Matchers._
import matchers.should.Matchers._
import org.scalatest.matchers
import org.scalatest.flatspec.AnyFlatSpec

class ClientCredentialFetcherSpec extends FlatSpec {
class ClientCredentialFetcherSpec extends AnyFlatSpec {

it should "fetch Basic64" in {
val request = new Request.Authorization(
Original file line number Diff line number Diff line change
@@ -2,10 +2,12 @@ package com.twitter.finagle.oauth2

import com.twitter.finagle.http.{HeaderMap, ParamMap}
import org.scalatest._
import org.scalatest.Matchers._
import matchers.should.Matchers._
import com.twitter.util.{Await, Future}
import org.scalatest.matchers
import org.scalatest.flatspec.AnyFlatSpec

class ClientCredentialsSpec extends FlatSpec {
class ClientCredentialsSpec extends AnyFlatSpec {

it should "handle request" in {
val clientCredentials = GrantHandler.ClientCredentials
7 changes: 4 additions & 3 deletions src/test/scala/com/twitter/finagle/oauth2/EndToEndSpec.scala
Original file line number Diff line number Diff line change
@@ -4,10 +4,11 @@ import com.twitter.finagle.OAuth2
import com.twitter.finagle.http.{HeaderMap, ParamMap}
import com.twitter.util.{Await, Future}
import java.util.Date
import org.scalatest.FlatSpec
import org.scalatest.Matchers._
import matchers.should.Matchers._
import org.scalatest.matchers
import org.scalatest.flatspec.AnyFlatSpec

class EndToEndSpec extends FlatSpec {
class EndToEndSpec extends AnyFlatSpec {

def successfulAccessTokenHandler(): MockDataHandler = new MockDataHandler() {
override def validateClient(clientId: String, clientSecret: String, grantType: String): Future[Boolean] =
6 changes: 4 additions & 2 deletions src/test/scala/com/twitter/finagle/oauth2/PasswordSpec.scala
Original file line number Diff line number Diff line change
@@ -2,10 +2,12 @@ package com.twitter.finagle.oauth2

import com.twitter.finagle.http.{HeaderMap, ParamMap}
import org.scalatest._
import org.scalatest.Matchers._
import matchers.should.Matchers._
import com.twitter.util.{Await, Future}
import org.scalatest.matchers
import org.scalatest.flatspec.AnyFlatSpec

class PasswordSpec extends FlatSpec {
class PasswordSpec extends AnyFlatSpec {

it should "handle request" in {
val password = GrantHandler.Password
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.twitter.finagle.oauth2

import com.twitter.finagle.http.{HeaderMap, ParamMap}
import org.scalatest.FlatSpec
import org.scalatest.Matchers._
import matchers.should.Matchers._
import com.twitter.util.{Await, Future}
import org.scalatest.matchers
import org.scalatest.flatspec.AnyFlatSpec

class RefreshTokenSpec extends FlatSpec {
class RefreshTokenSpec extends AnyFlatSpec {

it should "handle request" in {
val refreshToken = GrantHandler.RefreshToken
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.twitter.finagle.oauth2

import com.twitter.finagle.http.{HeaderMap, ParamMap}
import org.scalatest.Matchers._
import org.scalatest.FlatSpec
import matchers.should.Matchers._
import org.scalatest.matchers
import org.scalatest.flatspec.AnyFlatSpec

class RequestParameterSpec extends FlatSpec {
class RequestParameterSpec extends AnyFlatSpec {

def createRequest(
oauthToken: Option[String],