Merge pull request #8 from osafi/master

IDEA 2018.3 Support

build.gradle

@@ -13,7 +13,7 @@ intellij {
 }
 
 patchPluginXml {
-    sinceBuild "173"
+    sinceBuild "183"
 }
 
 repositories {

gradle.properties

@@ -1,5 +1,5 @@
 name = IdeaJasmine
 group = io.pivotal.jasmine
 version = 1.3
-ideaVersion = IU-2018.2.4
+ideaVersion = IU-LATEST-EAP-SNAPSHOT
 publishChannels = Stable

src/main/kotlin/io/pivotal/intellij/jasmine/JasmineRunConfiguration.kt

@@ -17,7 +17,8 @@ import org.jdom.Element
 import java.nio.file.Paths
 
 
-class JasmineRunConfiguration(project: Project, factory: ConfigurationFactory, name: String) : LocatableConfigurationBase(project, factory, name) {
+class JasmineRunConfiguration(project: Project, factory: ConfigurationFactory, name: String)
+    : LocatableConfigurationBase<Any>(project, factory, name) {
     var jasmineRunSettings = JasmineRunSettings()
     private var _jasminePackage: NodePackage? = null
 

src/test/kotlin/io/pivotal/intellij/jasmine/JasmineConfigIconProviderTest.kt

@@ -3,7 +3,8 @@ package io.pivotal.intellij.jasmine
 import com.intellij.json.JsonFileType
 import com.intellij.openapi.util.IconLoader.CachedImageIcon
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase
-import org.fest.assertions.Assertions.assertThat
+import org.hamcrest.CoreMatchers.endsWith
+import org.junit.Assert.assertThat
 
 class JasmineConfigIconProviderTest : LightPlatformCodeInsightFixtureTestCase() {
 
@@ -12,7 +13,7 @@ class JasmineConfigIconProviderTest : LightPlatformCodeInsightFixtureTestCase()
 
         val jasmineIcon = JasmineConfigIconProvider().getIcon(jasmineConfigFile, 0) as CachedImageIcon
 
-        assertThat(jasmineIcon.toString()).endsWith("/icons/jasmine.png")
+        assertThat(jasmineIcon.toString(), endsWith("/icons/jasmine.png"))
     }
 
     fun `test does not show jasmine icon on other files`() {

src/test/kotlin/io/pivotal/intellij/jasmine/JasmineRunProfileStateTest.kt

@@ -6,8 +6,8 @@ import com.intellij.execution.process.KillableColoredProcessHandler
 import com.intellij.execution.runners.ExecutionEnvironmentBuilder
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase
 import io.pivotal.intellij.jasmine.scope.JasmineScope
-import junit.framework.TestCase
-import org.fest.assertions.Assertions.assertThat
+import org.hamcrest.CoreMatchers.*
+import org.junit.Assert.assertThat
 
 class JasmineRunProfileStateTest : LightPlatformCodeInsightFixtureTestCase() {
 
@@ -37,9 +37,9 @@ class JasmineRunProfileStateTest : LightPlatformCodeInsightFixtureTestCase() {
                 specFile = testFilePath
         ))
 
-        assertThat(testFileCommand).endsWith(testFilePath)
-        assertThat(suiteCommand).endsWith(testFilePath)
-        assertThat(testCommand).endsWith(testFilePath)
+        assertThat(testFileCommand, endsWith(testFilePath))
+        assertThat(suiteCommand, endsWith(testFilePath))
+        assertThat(testCommand, endsWith(testFilePath))
     }
 
     fun `test test names added as filter`() {
@@ -52,8 +52,8 @@ class JasmineRunProfileStateTest : LightPlatformCodeInsightFixtureTestCase() {
                 testNames = listOf("App", "spec", "name with spaces")
         ))
 
-        assertThat(suiteCommand).endsWith("\"--filter=App.spec.name with spaces\"")
-        assertThat(testCommand).endsWith("\"--filter=App.spec.name with spaces\"")
+        assertThat(suiteCommand, endsWith("\"--filter=App.spec.name with spaces\""))
+        assertThat(testCommand, endsWith("\"--filter=App.spec.name with spaces\""))
     }
 
     fun `test filter not added when empty test names`() {
@@ -62,7 +62,7 @@ class JasmineRunProfileStateTest : LightPlatformCodeInsightFixtureTestCase() {
                 testNames = listOf()
         ))
 
-        assertThat(noFilterCommand).doesNotContain("--filter")
+        assertThat(noFilterCommand, not(containsString("--filter")))
     }
 
     private fun commandLineFromSettings(runSettings: JasmineRunSettings = JasmineRunSettings()): String {