variables_spec.rb in gooddata-0.6.19

- old
+ new

@@ -1,32 +1,30 @@
 require 'gooddata'
 
 describe "Variables implementation", :constraint => 'slow' do
   before(:all) do
-    @spec = JSON.parse(File.read("./spec/data/test_project_model_spec.json"), :symbolize_names => true)
+    @spec = JSON.parse(File.read("./spec/data/blueprints/test_project_model_spec.json"), :symbolize_names => true)
     @client = ConnectionHelper::create_default_connection
-    @project = @client.create_project_from_blueprint(@spec, :auth_token => ConnectionHelper::GD_PROJECT_TOKEN)
+    blueprint = GoodData::Model::ProjectBlueprint.new(@spec)
+    @project = @client.create_project_from_blueprint(blueprint, :token => ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT)
     @domain = @client.domain(ConnectionHelper::DEFAULT_DOMAIN)
 
     @label = GoodData::Attribute.find_first_by_title('Dev', client: @client, project: @project).label_by_name('email')
-    
-    blueprint = GoodData::Model::ProjectBlueprint.new(@spec)
+
     commits_data = [
       ["lines_changed","committed_on","dev_id","repo_id"],
       [1,"01/01/2014",1,1],
       [3,"01/02/2014",2,2],
       [5,"05/02/2014",3,1]]
-    GoodData::Model.upload_data(commits_data, blueprint, 'commits', :client => @client, :project => @project)
-    # blueprint.find_dataset('commits').upload(commits_data)
+    @project.upload(commits_data, blueprint, 'dataset.commits')
     
     devs_data = [
       ["dev_id", "email"],
       [1, "tomas@gooddata.com"],
       [2, "petr@gooddata.com"],
       [3, "jirka@gooddata.com"]]
-    GoodData::Model.upload_data(devs_data, blueprint, 'devs', :client => @client, :project => @project)
-    # blueprint.find_dataset('devs').upload(devs_data)
+    @project.upload(devs_data, blueprint, 'dataset.devs')
     
     @variable = @project.create_variable(title: 'uaaa', attribute: @label.attribute).save
 
   end
 
@@ -120,10 +118,10 @@
     filters = [[ConnectionHelper::DEFAULT_USERNAME, @label.uri, "tomas@gooddata.com"]]
     @project.add_variable_permissions(filters, @variable)
     perms = @variable.user_values
     pretty = perms.pmap {|f| [f.related.login, f.pretty_expression]}
     expect(perms.first.related).to eq @client.user
-    expect(pretty).to eq [["svarovsky+gem_tester@gooddata.com", "[Dev] IN ([tomas@gooddata.com])"]]
+    expect(pretty).to eq [[ConnectionHelper::DEFAULT_USERNAME, "[Dev] IN ([tomas@gooddata.com])"]]
   end
 
   it "sets up mandatory users based on the state given as an end state by default." do
     # first let's prepare some user filters
     user_with_already_set_up_filter = @project.get_user(ConnectionHelper::DEFAULT_USERNAME)