Commit 90cbb73e authored by Stan Hu's avatar Stan Hu

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

Closes #1267
parent 29f6b01d
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)
......@@ -74,9 +74,9 @@
= f.text_field :import_url, class: 'form-control', placeholder: ''
The repository must be accessible over HTTP(S). If it is not publicly accessible, you can add authentication information to the URL: <code></code>.
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
To migrate an SVN repository, check out #{link_to "this document", ""}.
......@@ -112,6 +112,6 @@
$ ->
$('.how_to_import_link').bind 'click', (e) ->
import_modal = $(this).parent().find(".modal").show()
import_modal = $(this).next(".modal").show()
$('.modal-header .close').bind 'click', ->
Feature: New Project
Given I sign in as a user
And I own project "Shop"
And I visit dashboard page
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
class Spinach::Features::NewProject < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedProject
step 'I click "New project" link' do
click_link "New project"
step 'I see "New project" page' do
page.should have_content("Project path")
step 'I click on "Import project from GitHub"' do
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
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment