diff options
| author | Robert | 2017-08-02 05:53:27 +0200 |
|---|---|---|
| committer | Robert | 2017-08-02 05:53:27 +0200 |
| commit | 4ac49da3e416a0ec24a2c0169d5e9fd934c61f01 (patch) | |
| tree | 70d944e2ed37a2d5dda614dbbdf4bfa150a9b8ec | |
| parent | 0d03340ad3dc52b6f06c6643752ec5393103179e (diff) | |
| parent | 24b079038f4fa6af2c0f6399334c7243ed5e70bc (diff) | |
| download | chouette-core-4ac49da3e416a0ec24a2c0169d5e9fd934c61f01.tar.bz2 | |
conflict resolution
| -rw-r--r-- | spec/requests/api/v1/netex_import_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/v1/netex_import_spec.rb b/spec/requests/api/v1/netex_import_spec.rb index e9b051043..a48d5626a 100644 --- a/spec/requests/api/v1/netex_import_spec.rb +++ b/spec/requests/api/v1/netex_import_spec.rb @@ -30,7 +30,7 @@ RSpec.describe "NetexImport", type: :request do context 'with correct credentials and correct request' do let( :authorization ){ authorization_token_header( get_api_key.token ) } - it 'succeeds', :wip do + it 'succeeds' do post_request.(netex_import: legal_attributes) expect( response ).to be_success expect( json_response_body ).to eq( |