Skip to content
This repository was archived by the owner on May 21, 2022. It is now read-only.

Fix duplicate output directory declaration in sass compile task #12

Open
breskeby wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix duplicate output directory declaration in sass compile task #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 plugin/src/main/java/org/kravemir/gradle/sass/SassCompileTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void setSrcDir(File srcDir) {
this.srcDir = srcDir;
}

@OutputDirectory
@Internal
public File getOutDir() {
return outDir != null ? outDir : Paths.get(getProject().getBuildDir().getPath(), "sass", sassSetName).toFile();
}
Expand Down
25 changes: 23 additions & 2 deletions plugin/src/test/java/org/kravemir/gradle/sass/tests/IncrementalTasksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class IncrementalTasksTest {
@Before
public void setup() throws IOException {
File buildFile = testProjectDir.newFile("build.gradle");
writeFile(buildFile, "plugins {\n id 'org.kravemir.gradle.sass'\n }\nsass{\nmain{}}");
writeFile(buildFile, "plugins {\n id 'org.kravemir.gradle.sass'\n }\nsass{\nmain{}}\n");

Path mainSassPath = Paths.get(testProjectDir.getRoot().getPath(),"src","main","sass");
Files.createDirectories(mainSassPath);
Expand Down Expand Up @@ -77,11 +77,32 @@ public void testFooDeletion() {
assertFalse(mainSassBuildRoot.resolve(Paths.get("foo.css")).toFile().exists());
}

@Test
public void testOutputHandling() throws IOException {
File buildFile = new File(testProjectDir.getRoot(), "build.gradle");
writeFile(buildFile,
"task myCopy(type:Sync) { \n" +
"from(mainSass) \n " +
"into('build/myCopy')\n" +
"\n }");

GradleRunner.create()
.withProjectDir(testProjectDir.getRoot())
.withArguments("myCopy", "--warning-mode", "fail")
.withGradleVersion("6.0-20191014000926+0000")
.withPluginClasspath()
.build();

Path syncedCss = Paths.get(testProjectDir.getRoot().getPath(), "build", "myCopy");
assertTrue(syncedCss.resolve(Paths.get("main.css")).toFile().exists());
assertTrue(syncedCss.resolve(Paths.get("foo.css")).toFile().exists());
}


private void writeFile(File destination, String content) throws IOException {
BufferedWriter output = null;
try {
output = new BufferedWriter(new FileWriter(destination));
output = new BufferedWriter(new FileWriter(destination, true));
output.write(content);
} finally {
if (output != null) {
Expand Down