spec/rest/client_spec.rb in finapps-1.0.6 vs spec/rest/client_spec.rb in finapps-1.0.7

@@ -20,19 +20,10 @@
 
     context 'when options are not provided' do
       it { expect { FinApps::REST::Client.new :company_identifier, :company_token }.not_to raise_error }
     end
 
-<<<<<<< HEAD
-    it 'responds to public api methods' do
-      [:alert, :alert_definition, :alert_settings, :alert_preferences,
-       :budgets, :budget_calculation, :budget_models, :cashflows,
-       :categories, :institutions, :transactions,
-       :user_institutions, :users,
-       :rule_sets].each do |method|
-        expect(@client).to respond_to(method)
-=======
   end
 
   context 'after initialized' do
 
     let(:client) { FinApps::REST::Client.new(:company_identifier, :company_token) }
@@ -40,11 +31,10 @@
     [:send_request, :connection, :users, :institutions, :user_institutions, :transactions,
      :categories, :budget_models, :budget_calculation, :budgets, :cashflows, :alert,
      :alert_definition, :alert_preferences, :alert_settings, :rule_sets, :user_credentials!].each do |method|
       it "responds to #{method}" do
         expect(client).to respond_to(method)
->>>>>>> develop
       end
     end
 
     describe '#users' do
       it { expect(client.users).to be_an_instance_of(FinApps::REST::Users) }
@@ -127,7 +117,6 @@
 
     end
 
   end
 
-end
-
+end
\ No newline at end of file