Merge branch 'fix-import-from-modal' into 'master'

Fix "Import projects from" button to show the correct instructions

Closes #1267

See merge request !422

CHANGELOG

 Please view this file on the master branch, on stable branches it's out of date.
 v 7.10.0 (unreleased)
+  - Fix "Import projects from" button to show the correct instructions (Stan Hu)
   - Update poltergeist to version 1.6.0 to support PhantomJS 2.0 (Zeger-Jan van de Weg)
   - Fix cross references when usernames, milestones, or project names contain underscores (Stan Hu)
   - enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger)

app/views/projects/new.html.haml

@@ -74,9 +74,9 @@
               = f.text_field :import_url, class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git'
               .alert.alert-info.prepend-top-10
                 %ul
-                  %li 
+                  %li
                     The repository must be accessible over HTTP(S). If it is not publicly accessible, you can add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.
-                  %li 
+                  %li
                     The import will time out after 4 minutes. For big repositories, use a clone/push combination.
                   %li
                     To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"}.
@@ -112,6 +112,6 @@
   $ ->
     $('.how_to_import_link').bind 'click', (e) ->
       e.preventDefault()
-      import_modal = $(this).parent().find(".modal").show()
+      import_modal = $(this).next(".modal").show()
     $('.modal-header .close').bind 'click', ->
       $(".modal").hide()

features/dashboard/new_project.feature

+@dashboard
+Feature: New Project
+Background:
+  Given I sign in as a user
+  And I own project "Shop"
+  And I visit dashboard page
+
+  @javascript
+  Scenario: I should see New projects page
+  Given I click "New project" link
+  Then I see "New project" page
+  When I click on "Import project from GitHub"
+  Then I see instructions on how to import from GitHub

features/steps/dashboard/new_project.rb

+class Spinach::Features::NewProject < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedPaths
+  include SharedProject
+
+  step 'I click "New project" link' do
+    click_link "New project"
+  end
+
+  step 'I see "New project" page' do
+    page.should have_content("Project path")
+  end
+
+  step 'I click on "Import project from GitHub"' do
+    first('.how_to_import_link').click
+  end
+
+  step 'I see instructions on how to import from GitHub' do
+    github_modal = first('.modal-body')
+    github_modal.should be_visible
+    github_modal.should have_content "To enable importing projects from GitHub"
+
+    all('.modal-body').each do |element|
+      element.should_not be_visible unless element == github_modal
+    end
+  end
+end