diff --git a/spec/acceptance/api/records_spec.rb b/spec/acceptance/api/records_spec.rb index 345bbdcf66..664f18a44b 100644 --- a/spec/acceptance/api/records_spec.rb +++ b/spec/acceptance/api/records_spec.rb @@ -5,10 +5,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../acceptance_helper') feature "API 1.0 records management" do before(:all) do - puts "\n[rspec][records_spec] Creating test user database..." Capybara.current_driver = :rack_test - @user = create_user(:username => 'test') - puts "[rspec][records_spec] Running..." + @user = create_user({:username => 'test'}) end before(:each) do @@ -25,7 +23,7 @@ feature "API 1.0 records management" do content = @user.run_query("select * from \"#{@table.name}\"")[:rows] - get_json "#{api_table_records_url(@table.name)}?rows_per_page=2" do |response| + get_json api_table_records_url(@table.name, :rows_per_page => 2) do |response| response.status.should be_success response.body[:id].should == @table.id response.body[:name].should == @table.name @@ -61,7 +59,7 @@ feature "API 1.0 records management" do content = @user.run_query("select * from \"#{@table.name}\"")[:rows] - get_json "#{api_table_records_url(@table.name)}?order_by=name&mode=asc" do |response| + get_json api_table_records_url(@table.name, :order_by => 'name', :mode => 'asc') do |response| response.status.should be_success response.body[:id].should == @table.id response.body[:name].should == @table.name @@ -72,7 +70,7 @@ feature "API 1.0 records management" do should == content[1].slice(:cartodb_id, :name, :location, :description) end - get_json "#{api_table_records_url(@table.name)}?order_by=name&mode=desc" do |response| + get_json api_table_records_url(@table.name, :order_by => 'name', :mode => 'desc') do |response| response.status.should be_success response.body[:id].should == @table.id response.body[:name].should == @table.name diff --git a/spec/acceptance/support/paths.rb b/spec/acceptance/support/paths.rb index 72e0ef4afc..9834bd253b 100644 --- a/spec/acceptance/support/paths.rb +++ b/spec/acceptance/support/paths.rb @@ -49,8 +49,8 @@ module NavigationHelpers api_req "#{api_url_prefix}/tables/#{table_identifier}/records#{params.empty? ? '' : '?' }#{params.to_query}" end - def api_table_record_url(table_identifier, row_identifier) - api_req "#{api_url_prefix}/tables/#{table_identifier}/records/#{row_identifier}" + def api_table_record_url(table_identifier, row_identifier, params = {}) + api_req "#{api_url_prefix}/tables/#{table_identifier}/records/#{row_identifier}#{params.empty? ? '' : '?' }#{params.to_query}" end def api_table_columns_url(table_identifier) @@ -62,7 +62,7 @@ module NavigationHelpers end def api_table_record_column_url(table_identifier, row_identifier, column_name) - api_req"#{api_url_prefix}/tables/#{table_identifier}/records/#{row_identifier}/columns/#{column_name}" + api_req "#{api_url_prefix}/tables/#{table_identifier}/records/#{row_identifier}/columns/#{column_name}" end def api_table_records_pending_addresses_url(table_identifier)