Fix failing unit tests

Author: ShahzaibAwan

lib/travis/api/app/endpoint/setting_endpoint.rb

@@ -72,7 +72,7 @@ def create
 
       record = collection.create(JSON.parse(request.body.read)[singular_name])
       if record.valid?
-        @changes = { :"env_vars" => { created: "name: #{record.name}, is_public: #{record.public}, branch: #{record.branch || 'all'} " } } if is_env_var?
+        @changes = { :"env_vars" => { created: "name: #{record.name}, is_public: #{record.public}, branch: #{record.branch || 'all'}" } } if is_env_var?
 
         repo_settings.save
         run_callbacks :after_save if is_env_var?

lib/travis/api/v3/models/env_vars.rb

@@ -16,10 +16,9 @@ def to_h
     end
 
     def create(attributes)
-      @changes = { :"env_vars" => { created: "#{attributes}" } }
+      @changes = { :"env_vars" => { created: "#{attributes.except("value")}" } }
       env_var = super(attributes).tap { sync! }
       run_callbacks :after_save
-      @changes = {}
       env_var
     end
 
@@ -30,10 +29,9 @@ def add(env_var)
 
     def destroy(id)
       env_var = find(id)
-      @changes = { :"env_vars" => { deleted: "#{env_var.attributes}" } }
+      @changes = { :"env_vars" => { deleted: "#{env_var.attributes.delete("value")}" } }
       deleted_env_var = super(id).tap { sync! }
       run_callbacks :after_save
-      @changes = {}
       deleted_env_var
     end
 
@@ -50,6 +48,7 @@ def changes
     def save_audit
       if self.change_source
         Travis::API::V3::Models::Audit.create!(owner: self.user, change_source: self.change_source, source: self.repository, source_changes: { settings: self.changes })
+        @changes = {}
       end
     end
   end

spec/v3/services/env_vars/create_spec.rb

@@ -66,11 +66,6 @@
       )
     end
     example { expect(repo.reload.env_vars.count).to eq(0) }
-    example 'audit is created' do
-      expect(Travis::API::V3::Models::Audit.last.source_id).to eq(repo.id)
-      expect(Travis::API::V3::Models::Audit.last.source_type).to eq('Repository')
-      expect(Travis::API::V3::Models::Audit.last.source_changes).to eq({"settings"=>{"env_vars"=>{"created"=> "{\"name\"=>\"FOO\", \"value\"=>\"bar\", \"public\"=>false}"}}}) 
-    end
   end
 
   describe 'authenticated, existing repo, env var already exists' do
@@ -131,6 +126,11 @@
       example 'persists repository id' do
         expect(repo.reload.settings['env_vars'].first['repository_id']).to eq repo.id
       end
+      example 'audit is created' do
+        expect(Travis::API::V3::Models::Audit.last.source_id).to eq(repo.id)
+        expect(Travis::API::V3::Models::Audit.last.source_type).to eq('Repository')
+        expect(Travis::API::V3::Models::Audit.last.source_changes).to eq({"settings"=>{"env_vars"=>{"created"=> "{\"name\"=>\"FOO\", \"public\"=>false}"}}}) 
+      end
     end
 
     describe 'public' do