spec/riak/map_reduce/phase_spec.rb in riak-client-2.0.0 vs spec/riak/map_reduce/phase_spec.rb in riak-client-2.1.0

- old
+ new

@@ -4,57 +4,57 @@ before :each do @js_fun = "function(v,_,_){ return v['values'][0]['data']; }" @erl_fun = "fun(Obj, _KeyData, _Arg) -> [{riak_object:key(Obj), riak_object:get_value(Obj)}] end." end - it "should initialize with a type and a function" do + it "initializes with a type and a function" do phase = Riak::MapReduce::Phase.new(:type => :map, :function => @js_fun, :language => "javascript") expect(phase.type).to eq(:map) expect(phase.function).to eq(@js_fun) expect(phase.language).to eq("javascript") end - it "should initialize with a type and an MF" do + it "initializes with a type and an MF" do phase = Riak::MapReduce::Phase.new(:type => :map, :function => ["module", "function"], :language => "erlang") expect(phase.type).to eq(:map) expect(phase.function).to eq(["module", "function"]) expect(phase.language).to eq("erlang") end - it "should initialize with a type and a bucket/key" do + it "initializes with a type and a bucket/key" do phase = Riak::MapReduce::Phase.new(:type => :map, :function => {:bucket => "funs", :key => "awesome_map"}, :language => "javascript") expect(phase.type).to eq(:map) expect(phase.function).to eq({:bucket => "funs", :key => "awesome_map"}) expect(phase.language).to eq("javascript") end - it "should assume the language is erlang when the function is an array" do + it "assumes the language is erlang when the function is an array" do phase = Riak::MapReduce::Phase.new(:type => :map, :function => ["module", "function"]) expect(phase.language).to eq("erlang") end - it "should assume the language is javascript when the function is a string and starts with function" do + it "assumes the language is javascript when the function is a string and starts with function" do phase = Riak::MapReduce::Phase.new(:type => :map, :function => @js_fun) expect(phase.language).to eq("javascript") end - it "should assume the language is erlang when the function is a string and starts with anon fun" do + it "assumes the language is erlang when the function is a string and starts with anon fun" do phase = Riak::MapReduce::Phase.new(:type => :map, :function => @erl_fun) expect(phase.language).to eq("erlang") end - it "should assume the language is javascript when the function is a hash" do + it "assumes the language is javascript when the function is a hash" do phase = Riak::MapReduce::Phase.new(:type => :map, :function => {:bucket => "jobs", :key => "awesome_map"}) expect(phase.language).to eq("javascript") end - it "should accept a WalkSpec for the function when a link phase" do + it "accepts a WalkSpec for the function when a link phase" do phase = Riak::MapReduce::Phase.new(:type => :link, :function => Riak::WalkSpec.new({})) expect(phase.function).to be_kind_of(Riak::WalkSpec) end - it "should raise an error if a WalkSpec is given for a phase type other than :link" do + it "raises an error if a WalkSpec is given for a phase type other than :link" do expect { Riak::MapReduce::Phase.new(:type => :map, :function => Riak::WalkSpec.new({})) }.to raise_error(ArgumentError) end describe "converting to JSON for the job" do before :each do @@ -65,43 +65,43 @@ describe "when a #{type} phase" do before :each do @phase.type = type end - it "should be an object with a single key of '#{type}'" do + it "is an object with a single key of '#{type}'" do expect(@phase.to_json).to match(/^\{"#{type}":/) end - it "should include the language" do + it "includes the language" do expect(@phase.to_json).to match(/"language":/) end - it "should include the keep value" do + it "includes the keep value" do expect(@phase.to_json).to match(/"keep":false/) @phase.keep = true expect(@phase.to_json).to match(/"keep":true/) end - it "should include the function source when the function is a source string" do + it "includes the function source when the function is a source string" do @phase.function = "function(v,_,_){ return v; }" expect(@phase.to_json).to include(@phase.function) expect(@phase.to_json).to match(/"source":/) end - it "should include the function name when the function is not a lambda" do + it "includes the function name when the function is not a lambda" do @phase.function = "Riak.mapValues" expect(@phase.to_json).to include('"name":"Riak.mapValues"') expect(@phase.to_json).not_to include('"source"') end - it "should include the bucket and key when referring to a stored function" do + it "includes the bucket and key when referring to a stored function" do @phase.function = {:bucket => "design", :key => "wordcount_map"} expect(@phase.to_json).to include('"bucket":"design"') expect(@phase.to_json).to include('"key":"wordcount_map"') end - it "should include the module and function when invoking an Erlang function" do + it "includes the module and function when invoking an Erlang function" do @phase.function = ["riak_mapreduce", "mapreduce_fun"] expect(@phase.to_json).to include('"module":"riak_mapreduce"') expect(@phase.to_json).to include('"function":"mapreduce_fun"') end end @@ -111,26 +111,26 @@ before :each do @phase.type = :link @phase.function = {} end - it "should be an object of a single key 'link'" do + it "is an object of a single key 'link'" do expect(@phase.to_json).to match(/^\{"link":/) end - it "should include the bucket" do + it "includes the bucket" do expect(@phase.to_json).to match(/"bucket":"_"/) @phase.function[:bucket] = "foo" expect(@phase.to_json).to match(/"bucket":"foo"/) end - it "should include the tag" do + it "includes the tag" do expect(@phase.to_json).to match(/"tag":"_"/) @phase.function[:tag] = "parent" expect(@phase.to_json).to match(/"tag":"parent"/) end - it "should include the keep value" do + it "includes the keep value" do expect(@phase.to_json).to match(/"keep":false/) @phase.keep = true expect(@phase.to_json).to match(/"keep":true/) @phase.keep = false @phase.function[:keep] = true