[Notice] Announcing the End of Demo Server [Read me]
yona-projects / yona star
박완순 2014-03-18
Merge branch 'bugfix/import' of kjkmadness/yobi 
from pull request 717
@2c5256a4bc39b0ee879a29d2b36d810be4647847
2d39200
2c5256a
app/controllers/ImportApp.java
--- app/controllers/ImportApp.java
+++ app/controllers/ImportApp.java
@@ -13,6 +13,7 @@
 
 import utils.FileUtil;
 
 import views.html.project.importing;
 
 
+import org.apache.commons.lang3.StringUtils;
 
 import org.eclipse.jgit.api.errors.*;
 
 import java.io.IOException;
@@ -50,8 +51,8 @@
 
 
         Form<Project> filledNewProjectForm = form(Project.class).bindFromRequest();
 
 
-        String gitUrl = filledNewProjectForm.data().get("url");
 
-        if(gitUrl == null || gitUrl.trim().isEmpty()) {
 
+        String gitUrl = StringUtils.trim(filledNewProjectForm.data().get("url"));
 
+        if(StringUtils.isBlank(gitUrl)) {
 
             flash(Constants.WARNING, "project.import.error.empty.url");
 
             return badRequest(importing.render("title.newProject", filledNewProjectForm));
 
         }
2d39200
2c5256a
app/views/project/overview.scala.html
--- app/views/project/overview.scala.html
+++ app/views/project/overview.scala.html
@@ -45,7 +45,7 @@
 
                 </div>
 
             </div>
 
             <div class="project-clone-wrap span3">
 
-                <input type="text" class="project-clone-url" id="cloneURL" readonly="readonly" value="@if(project.isGit){ @CodeApp.getURLWithLoginId(project) } else { @CodeApp.getURL(project) }">
 
+                <input type="text" class="project-clone-url" id="cloneURL" readonly="readonly" value="@if(project.isGit){@CodeApp.getURLWithLoginId(project)} else {@CodeApp.getURL(project)}">
 
                 <button class="ybtn project-clone-button" id="cloneURLBtn">@Messages("code.copyUrl")</button>
 
             </div>
 
         </div>
 
2c5256a
test/controllers/ImportAppTest.java (added)
+++ test/controllers/ImportAppTest.java
@@ -0,0 +1,192 @@
+/**
+ * Yobi, Project Hosting SW
+ *
+ * Copyright 2013 NAVER Corp.
+ * http://yobi.io
+ *
+ * @Author kjkmadness
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package controllers;
+
+import static org.fest.assertions.Assertions.*;
+import static play.test.Helpers.*;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import models.Project;
+import models.User;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import controllers.routes.ref;
+
+import play.mvc.Result;
+import play.test.FakeApplication;
+import playRepository.GitRepository;
+import utils.Constants;
+
+public class ImportAppTest {
+    private FakeApplication application;
+    private User yobi;
+    private Project src;
+    private Project dest;
+    private Map<String, String> formData;
+
+    @Before
+    public void before() throws Exception {
+        GitRepository.setRepoPrefix("resources/test/repo/git/");
+        GitRepository.setRepoForMergingPrefix("resources/test/repo/git-merging/");
+        application = support.Helpers.makeTestApplication();
+        start(application);
+        yobi = User.findByLoginId("yobi");
+        src = project(yobi.loginId, "src");
+        dest = project(yobi.loginId, "dest");
+        createRepository(src);
+        formData = new HashMap<>();
+    }
+
+    @After
+    public void after() {
+        stop(application);
+        support.Files.rm_rf(new File(GitRepository.getRepoPrefix()));
+        support.Files.rm_rf(new File(GitRepository.getRepoForMergingPrefix()));
+    }
+
+    @Test
+    public void importFormAnonymous() {
+        // When
+        Result result = callAction(ref.ImportApp.importForm());
+
+        // Then
+        assertThat(status(result)).isEqualTo(SEE_OTHER);
+        assertThat(header(LOCATION, result)).isEqualTo(routes.UserApp.loginForm().url());
+    }
+
+    @Test
+    public void importForm() {
+        // Given
+        User user = User.find.byId(2L);
+
+        // When
+        Result result = callAction(ref.ImportApp.importForm(),
+                fakeRequest().withSession(UserApp.SESSION_USERID, String.valueOf(user.id)));
+
+        // Then
+        assertThat(status(result)).isEqualTo(OK);
+    }
+
+    @Test
+    public void newProject() throws Exception {
+        // Given
+        formData.put("url", GitRepository.getGitDirectoryURL(src));
+        formData.put("name", dest.name);
+        formData.put("isPublic", "true");
+        formData.put("vcs", "GIT");
+
+        // When
+        Result result = callAction(ref.ImportApp.newProject(),
+                fakeRequest()
+                    .withSession(UserApp.SESSION_USERID, String.valueOf(yobi.id))
+                    .withFormUrlEncodedBody(formData));
+
+        // Then
+        assertThat(status(result)).isEqualTo(SEE_OTHER);
+        assertThat(header(LOCATION, result)).isEqualTo(routes.ProjectApp.project(dest.owner, dest.name).url());
+        assertThat(Project.findByOwnerAndProjectName(dest.owner, dest.name)).isNotNull();
+        assertThat(new File(GitRepository.getGitDirectoryURL(dest)).exists()).isTrue();
+    }
+
+    @Test
+    public void newProjectAnonymous() {
+        // When
+        Result result = callAction(ref.ImportApp.newProject());
+
+        // Then
+        assertThat(status(result)).isEqualTo(FORBIDDEN);
+    }
+
+    @Test
+    public void newProjectNoUrl() {
+        // Given
+        formData.put("name", dest.name);
+        formData.put("isPublic", "true");
+        formData.put("vcs", "GIT");
+
+        // When
+        Result result = callAction(ref.ImportApp.newProject(),
+                fakeRequest()
+                    .withSession(UserApp.SESSION_USERID, String.valueOf(yobi.id))
+                    .withFormUrlEncodedBody(formData));
+
+        // Then
+        assertThat(status(result)).isEqualTo(BAD_REQUEST);
+        assertThat(flash(result).get(Constants.WARNING)).isEqualTo("project.import.error.empty.url");
+    }
+
+    @Test
+    public void newProjectDuplicatedName() throws Exception {
+        // Given
+        formData.put("url", GitRepository.getGitDirectoryURL(src));
+        formData.put("name", "projectYobi");
+        formData.put("isPublic", "true");
+        formData.put("vcs", "GIT");
+
+        // When
+        Result result = callAction(ref.ImportApp.newProject(),
+                fakeRequest()
+                    .withSession(UserApp.SESSION_USERID, String.valueOf(yobi.id))
+                    .withFormUrlEncodedBody(formData));
+
+        // Then
+        assertThat(status(result)).isEqualTo(BAD_REQUEST);
+        assertThat(flash(result).get(Constants.WARNING)).isEqualTo("project.name.duplicate");
+    }
+
+    @Test
+    public void newProjectWrongName() throws Exception {
+        // Given
+        formData.put("url", GitRepository.getGitDirectoryURL(src));
+        formData.put("name", "!@#$%");
+        formData.put("isPublic", "true");
+        formData.put("vcs", "GIT");
+
+        // When
+        Result result = callAction(ref.ImportApp.newProject(),
+                fakeRequest()
+                    .withSession(UserApp.SESSION_USERID, String.valueOf(yobi.id))
+                    .withFormUrlEncodedBody(formData));
+
+        // Then
+        assertThat(status(result)).isEqualTo(BAD_REQUEST);
+        assertThat(flash(result).get(Constants.WARNING)).isEqualTo("project.name.alert");
+    }
+
+    private Project project(String owner, String name) {
+        Project project = new Project();
+        project.owner = owner;
+        project.name = name;
+        return project;
+    }
+
+    private void createRepository(Project project) throws Exception {
+        GitRepository gitRepository = new GitRepository(project);
+        gitRepository.create();
+        gitRepository.close();
+    }
+}
Add a comment
List