diff options
| author | cedricnjanga | 2017-09-06 10:56:58 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-09-06 11:01:22 +0200 |
| commit | 84789cce5ed46c5e280f449fcde32a8612c2fa9d (patch) | |
| tree | 706449d5b6f0ee96889ae6b9c5a07ccb57612288 /spec/features | |
| parent | e9360b375f27d43d91d833d301224b0b04daf2f1 (diff) | |
| parent | 13ad6afc8290080c8fc5e3efd6cb26aedf2853e2 (diff) | |
| download | chouette-core-84789cce5ed46c5e280f449fcde32a8612c2fa9d.tar.bz2 | |
Resolve merge conflict
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/connection_links_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/connection_links_spec.rb b/spec/features/connection_links_spec.rb index 0325e6e1c..7272242fe 100644 --- a/spec/features/connection_links_spec.rb +++ b/spec/features/connection_links_spec.rb @@ -34,7 +34,7 @@ RSpec.describe "ConnectionLinks", :type => :feature do visit referential_connection_links_path(referential) click_link "Ajouter une correspondance" fill_in "Nom", :with => "ConnectionLink 1" - fill_in "Identifiant Neptune", :with => "test:ConnectionLink:1" + fill_in "Identifiant Neptune", :with => "test:ConnectionLink:1:LOC" click_button("Créer correspondance") expect(page).to have_content("ConnectionLink 1") end |